From 8b0d5eab9fe37bdc5e39a2de48cf909506ab2611 Mon Sep 17 00:00:00 2001
From: Yan Zhu <yanzhuyan@google.com>
Date: Wed, 10 Jun 2020 15:22:11 -0700
Subject: Update package whitelist for car emulator

- Add missing packages to the whitelist
- Remove auto generate overlay package

Bug: 158123476
Test: lunch gcar_hl_md_emu_x86 && emulator -no-snapshot -skin 1280x720 -multidisplay 1,1280,720,120,0,2,1280,720,120,0 && atest android.car.apitest.PreInstalledPackagesTest#testNoCriticalErrors_enforceMode
Change-Id: Ie779bb1fd002fc4cc778dcd21fcd68807bb9cf2d
---
 .../preinstalled-packages-product-car-emulator.xml | 68 ++--------------------
 1 file changed, 6 insertions(+), 62 deletions(-)

diff --git a/common/preinstalled-packages-product-car-emulator.xml b/common/preinstalled-packages-product-car-emulator.xml
index 8e0efd0..4df0391 100644
--- a/common/preinstalled-packages-product-car-emulator.xml
+++ b/common/preinstalled-packages-product-car-emulator.xml
@@ -42,10 +42,6 @@
         <install-in user-type="FULL" />
         <install-in user-type="SYSTEM" />
     </install-in-user-type>
-    <install-in-user-type package="com.android.systemui.auto_generated_rro_product__">
-        <install-in user-type="FULL" />
-        <install-in user-type="SYSTEM" />
-    </install-in-user-type>
     <install-in-user-type package="com.android.traceur">
         <install-in user-type="FULL" />
         <install-in user-type="SYSTEM" />
@@ -69,16 +65,6 @@
         <install-in user-type="SYSTEM" />
     </install-in-user-type>
 
-    <!-- Required for SettingHelperTest -->
-    <install-in-user-type package="com.android.car.auto_generated_rro_product__">
-        <install-in user-type="FULL" />
-        <install-in user-type="SYSTEM" />
-    </install-in-user-type>
-    <install-in-user-type package="com.android.car.auto_generated_rro_vendor__">
-        <install-in user-type="FULL" />
-        <install-in user-type="SYSTEM" />
-    </install-in-user-type>
-
     <!-- Required for Wifi -->
     <install-in-user-type package="com.android.networkstack">
         <install-in user-type="FULL" />
@@ -91,11 +77,6 @@
         <install-in user-type="SYSTEM" />
     </install-in-user-type>
 
-    <!-- Required for DirectRenderingCluster -->
-    <install-in-user-type package="android.car.cluster.auto_generated_rro_product__">
-        <install-in user-type="FULL" />
-        <install-in user-type="SYSTEM" />
-    </install-in-user-type>
 <!--
   Apps that do need to run on SYSTEM and evaluated by package owner.
   Here the apps will have FULL only.
@@ -244,9 +225,6 @@
     </install-in-user-type>
     <install-in-user-type package="com.android.car.voicecontrol">
         <install-in user-type="FULL" />
-    </install-in-user-type>
-        <install-in-user-type package="com.android.car.voicecontrol.auto_generated_rro_product__">
-    <install-in user-type="FULL" />
     </install-in-user-type>
     <install-in-user-type package="com.android.documentsui">
         <install-in user-type="FULL" />
@@ -257,27 +235,9 @@
     <install-in-user-type package="com.android.car.datacenter">
         <install-in user-type="FULL" />
     </install-in-user-type>
-    <install-in-user-type package="com.android.car.bugreport.auto_generated_rro_product__">
-        <install-in user-type="FULL" />
-    </install-in-user-type>
-    <install-in-user-type package="com.android.car.radio.auto_generated_rro_product__">
-        <install-in user-type="FULL" />
-    </install-in-user-type>
-    <install-in-user-type package="com.android.bluetooth.auto_generated_rro_product__">
-        <install-in user-type="FULL" />
-    </install-in-user-type>
     <install-in-user-type package="com.android.timezone.updater">
         <install-in user-type="FULL" />
     </install-in-user-type>
-    <install-in-user-type package="com.android.car.auto_generated_rro_vendor__">
-        <install-in user-type="FULL" />
-    </install-in-user-type>
-    <install-in-user-type package="com.android.providers.settings.auto_generated_rro_product__">
-        <install-in user-type="FULL" />
-    </install-in-user-type>
-    <install-in-user-type package="com.android.traceur.auto_generated_rro_product__">
-        <install-in user-type="FULL" />
-    </install-in-user-type>
     <install-in-user-type package="com.android.sdksetup">
         <install-in user-type="FULL" />
     </install-in-user-type>
@@ -290,27 +250,15 @@
     <install-in-user-type package="com.android.theme.icon_pack.rounded.themepicker">
         <install-in user-type="FULL" />
     </install-in-user-type>
-    <install-in-user-type package="com.android.server.telecom.auto_generated_rro_product__">
-        <install-in user-type="FULL" />
-    </install-in-user-type>
     <install-in-user-type package="com.android.service.ims">
         <install-in user-type="FULL" />
     </install-in-user-type>
     <install-in-user-type package="com.android.safetyregulatoryinfo">
         <install-in user-type="FULL" />
     </install-in-user-type>
-    <install-in-user-type package="com.android.settings.intelligence.auto_generated_rro_product__">
-        <install-in user-type="FULL" />
-    </install-in-user-type>
-    <install-in-user-type package="com.android.providers.contacts.auto_generated_rro_product__">
-        <install-in user-type="FULL" />
-    </install-in-user-type>
     <install-in-user-type package="com.android.networkstack.tethering">
         <install-in user-type="FULL" />
     </install-in-user-type>
-    <install-in-user-type package="com.android.carrierconfig.auto_generated_rro_product__">
-        <install-in user-type="FULL" />
-    </install-in-user-type>
     <install-in-user-type package="com.android.emulator.multidisplay">
         <install-in user-type="FULL" />
     </install-in-user-type>
@@ -323,19 +271,10 @@
     <install-in-user-type package="com.android.apps.tag">
         <install-in user-type="FULL" />
     </install-in-user-type>
-    <install-in-user-type package="com.android.car.settings.auto_generated_rro_product__">
-        <install-in user-type="FULL" />
-    </install-in-user-type>
     <install-in-user-type package="com.android.angle">
         <install-in user-type="FULL" />
     </install-in-user-type>
-    <install-in-user-type package="com.android.car.media.auto_generated_rro_product__">
-        <install-in user-type="FULL" />
-    </install-in-user-type>
-    <install-in-user-type package="com.android.certinstaller.auto_generated_rro_product__">
-        <install-in user-type="FULL" />
-    </install-in-user-type>
-    <install-in-user-type package="com.android.car.carlauncher.auto_generated_rro_product__">
+    <install-in-user-type package="com.android.emulator.radio.config">
         <install-in user-type="FULL" />
     </install-in-user-type>
 
@@ -343,6 +282,11 @@
   Apps installed on multi-display emulator
   TODO: move to a MD-only XML file under vendor/auto/embedded/products
 -->
+    <!-- defaultToDeviceProtectedStorage -->
+    <install-in-user-type package="com.android.cellbroadcastreceiver.module">
+        <install-in user-type="FULL" />
+        <install-in user-type="SYSTEM" />
+    </install-in-user-type>
     <install-in-user-type package="com.android.car.secondaryhome">
         <install-in user-type="FULL" />
     </install-in-user-type>
-- 
cgit v1.2.3