Merge "Do not log error for auto-generated overlay package" into rvc-dev

2020-06-11 20:32:04 +00:00
parent 37fae4d72e a9fe46b2ff
commit f3aade31d6
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java
+++ b/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java
@@ -363,7 +363,8 @@ class UserSystemPackageInstaller {
        pmInt.forEachPackage(pkg -> {
            if (!pkg.isSystem()) return;
            final String pkgName = pkg.getManifestPackageName();
-            if (!allWhitelistedPackages.contains(pkgName)) {
+            if (!allWhitelistedPackages.contains(pkgName)
+                    && !isAutoGeneratedRRO(pmInt.getPackage(pkgName))) {
                errors.add(String.format(logMessageFmt, pkgName));
            }
        });