Merge "Remove ndk_platform backend. Use the ndk backend."
diff --git a/car_product/build/preinstalled-packages-product-car-base.xml b/car_product/build/preinstalled-packages-product-car-base.xml
index baae703..7c5f1d6 100644
--- a/car_product/build/preinstalled-packages-product-car-base.xml
+++ b/car_product/build/preinstalled-packages-product-car-base.xml
@@ -32,6 +32,14 @@
<install-in user-type="SYSTEM" />
</install-in-user-type>
+ <!-- These two packages should only support one proxy device-wide, and that
+ the proxy depends on the network, which are independent of users. -->
+ <install-in-user-type package="com.android.pacprocessor">
+ <install-in user-type="SYSTEM"/>
+ </install-in-user-type>
+ <install-in-user-type package="com.android.proxyhandler">
+ <install-in user-type="SYSTEM"/>
+ </install-in-user-type>
<!--
Apps that need to run on SYSTEM and evaluated by package owner.
Here the apps will have FULL and SYSTEM.
@@ -303,12 +311,6 @@
<install-in-user-type package="com.android.certinstaller">
<install-in user-type="FULL" />
</install-in-user-type>
- <install-in-user-type package="com.android.pacprocessor">
- <install-in user-type="FULL" />
- </install-in-user-type>
- <install-in-user-type package="com.android.proxyhandler">
- <install-in user-type="FULL" />
- </install-in-user-type>
<install-in-user-type package="com.android.vpndialogs">
<install-in user-type="FULL" />
</install-in-user-type>
diff --git a/car_product/overlay/packages/services/Telecomm/res/values/config.xml b/car_product/overlay/packages/services/Telecomm/res/values/config.xml
index b19ded4..37eac51 100644
--- a/car_product/overlay/packages/services/Telecomm/res/values/config.xml
+++ b/car_product/overlay/packages/services/Telecomm/res/values/config.xml
@@ -27,9 +27,6 @@
handle playing of the tones. -->
<bool name="allow_local_dtmf_tones">true</bool>
- <!-- Package name for the default in-call UI and dialer [DO NOT TRANSLATE] -->
- <string name="ui_default_package" translatable="false">com.android.car.dialer</string>
-
<!-- Class name for the default in-call UI Service [DO NOT TRANSLATE] -->
<string name="incall_default_class" translatable="false">com.android.car.dialer.telecom.InCallServiceImpl</string>
diff --git a/computepipe/aidl/Android.bp b/computepipe/aidl/Android.bp
index 0820223..ccd8753 100644
--- a/computepipe/aidl/Android.bp
+++ b/computepipe/aidl/Android.bp
@@ -10,7 +10,7 @@
"android/automotive/computepipe/*.aidl",
],
imports: [
- "android.hardware.graphics.common",
+ "android.hardware.graphics.common-V2",
],
stability: "vintf",
backend: {
@@ -27,7 +27,7 @@
aidl_interface {
name: "android.automotive.computepipe.registry",
vendor_available: true,
- imports: ["android.automotive.computepipe.runner"],
+ imports: ["android.automotive.computepipe.runner-V2"],
srcs: [
"android/automotive/computepipe/registry/*.aidl",
"android/automotive/computepipe/*.aidl",
