Merge "Add CompanionDeviceSupport system app to run as system user."
diff --git a/car_product/build/preinstalled-packages-product-car-base.xml b/car_product/build/preinstalled-packages-product-car-base.xml
index 1e819f0..933563b 100644
--- a/car_product/build/preinstalled-packages-product-car-base.xml
+++ b/car_product/build/preinstalled-packages-product-car-base.xml
@@ -241,7 +241,16 @@
<install-in user-type="FULL" />
<install-in user-type="SYSTEM" />
</install-in-user-type>
-
+ <!--
+ CompanionDeviceSupport app needs to run as user 0 for the Trusted Device feature to work.
+ It needs to run in the foreground user for other companion app features like calendar sync
+ and notifications bridging
+ -->
+ <install-in-user-type package="com.android.car.companiondevicesupport">
+ <install-in user-type="FULL" />
+ <install-in user-type="SYSTEM" />
+ </install-in-user-type>
+
<!--
Apps that may/may not run on SYSTEM. Some criteria:
- Do not require INTERACT_ACROSS_USER/INTERACT_ACROSS_USER_FULL
@@ -252,9 +261,6 @@
Here the apps will have FULL for now,
but they might be moved to first section if necessary.
-->
- <install-in-user-type package="com.android.car.companiondevicesupport">
- <install-in user-type="FULL" />
- </install-in-user-type>
<install-in-user-type package="com.android.egg">
<install-in user-type="FULL" />
</install-in-user-type>