Merge "Remove unused file" into rvc-qpr-dev
diff --git a/car_product/build/car.mk b/car_product/build/car.mk
index 67674ab..efbbc9b 100644
--- a/car_product/build/car.mk
+++ b/car_product/build/car.mk
@@ -22,7 +22,6 @@
PRODUCT_PACKAGES += \
Bluetooth \
CarDeveloperOptions \
- CompanionDeviceSupport \
OneTimeInitializer \
Provision \
StatementService \
diff --git a/car_product/overlay/frameworks/base/core/res/res/values/config.xml b/car_product/overlay/frameworks/base/core/res/res/values/config.xml
index 4538e60..2b49a42 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values/config.xml
@@ -97,8 +97,6 @@
<string name="config_dataUsageSummaryComponent">com.android.car.settings/com.android.car.settings.datausage.DataWarningAndLimitActivity</string>
- <string name="config_defaultTrustAgent" translatable="false">com.android.car.companiondevicesupport/.feature.trust.TrustedDeviceAgentService</string>
-
<!-- Controls whether system buttons use all caps for text -->
<bool name="config_buttonTextAllCaps">false</bool>
diff --git a/packages/CarShell/Android.bp b/packages/CarShell/Android.bp
index 88e0ac9..93fa7b4 100644
--- a/packages/CarShell/Android.bp
+++ b/packages/CarShell/Android.bp
@@ -1,8 +1,11 @@
android_app {
name: "CarShell",
srcs: ["src/**/*.java"],
+ // Although it has carshell name, it add permission to shell package
required: ["allowed_privapp_com.android.carshell"],
platform_apis: true,
certificate: "platform",
+ overrides: ["Shell"],
privileged: true,
+ static_libs: ["Shell-package-library"]
}
diff --git a/packages/CarShell/AndroidManifest.xml b/packages/CarShell/AndroidManifest.xml
index d03fc90..4188d5e 100644
--- a/packages/CarShell/AndroidManifest.xml
+++ b/packages/CarShell/AndroidManifest.xml
@@ -17,7 +17,7 @@
*/
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.car.shell"
+ package="com.android.shell"
coreApp="true"
android:sharedUserId="android.uid.shell"
>