Merge "Automatically allowlist carui RRO packages."

2020-11-11 21:00:09 +00:00
parent 6428f808b8 df0f283b9d
commit 94003ec9ea
1 changed files with 2 additions and 0 deletions
--- 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__");
    }