From a9fe46b2ffb1e5d0c9f9d5ec85d249a1550f70d5 Mon Sep 17 00:00:00 2001
From: Yan Zhu <yanzhuyan@google.com>
Date: Thu, 11 Jun 2020 09:07:54 -0700
Subject: Do not log error for auto-generated overlay package

Bug: 157159736
Test: atest
android.car.apitest.PreInstalledPackagesTest#testNoCriticalErrors_enforceMode

Change-Id: I7636ffa1d91adc490532150c57a8fcf90b5c795e
---
 .../core/java/com/android/server/pm/UserSystemPackageInstaller.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java b/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java
index 7c89b9850c5d..492b84a0a84b 100644
--- 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));
             }
         });
-- 
cgit v1.2.3-59-g8ed1b