From df0f283b9dd309938ca70d512d27b5b48b4a757e Mon Sep 17 00:00:00 2001 From: Felipe Leme Date: Tue, 10 Nov 2020 14:30:15 -0800 Subject: [PATCH] Automatically allowlist carui RRO packages. Test: adb shell cmd user report-system-user-package-whitelist-problems --critical-only --mode 1 | grep carri || echo NOT_FOUND Test: atest PreInstalledPackagesTest Fixes: 172875945 Bug: 172956245 Change-Id: I137c2c0f3094899e864dcdfc83866f07fb1b210f --- .../java/com/android/server/pm/UserSystemPackageInstaller.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java b/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java index f058ad991e023..252ba6061b7a4 100644 --- a/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java +++ b/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java @@ -418,6 +418,8 @@ class UserSystemPackageInstaller { @VisibleForTesting static boolean hasAutoGeneratedRROSuffix(String name) { return name.endsWith(".auto_generated_rro_product__") + // TODO(b/172956245): temporary workaround until OEMs can customize name + || name.endsWith("carui.rro") || name.endsWith("carui.overlayable.rro") || name.endsWith(".auto_generated_rro_vendor__"); }