summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yan Zhu <yanzhuyan@google.com> 2020-06-11 09:07:54 -0700
committer Yan Zhu <yanzhuyan@google.com> 2020-06-11 17:20:16 +0000
commita9fe46b2ffb1e5d0c9f9d5ec85d249a1550f70d5 (patch)
treeaf2702cddc9fc7d187cfbc2cb1346a7007057d07
parent8808b5a3d3a5deeff7ddf066c59ecb96e817a71a (diff)
Do not log error for auto-generated overlay package
Bug: 157159736 Test: atest android.car.apitest.PreInstalledPackagesTest#testNoCriticalErrors_enforceMode Change-Id: I7636ffa1d91adc490532150c57a8fcf90b5c795e
-rw-r--r--services/core/java/com/android/server/pm/UserSystemPackageInstaller.java3
1 files changed, 2 insertions, 1 deletions
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));
}
});