commit 44c4ca41d83d73d7c1d0e217a80a46a449e8c475
author Jackal Guo <jackalguo@google.com> Thu May 31 15:01:34 2018 +0800
committer Jackal Guo <jackalguo@google.com> Fri Jun 01 12:22:38 2018 +0800
tree 3df53d0a689bf2683e16bf97f35e966934c627aa
parent 7d2d403a83dcf39a843ab495a6431341d8e54d2a

Update checking of flag MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

Update the logic in PackageParser to avoid unistalled system app
can't be found.

Test: follow steps on b/80444486 and can add account normally
Test: PackageManagerTest
Bug: 80444486
Change-Id: Ifafac34111d883e51563018be793655c25d09fba

core/java/android/content/pm/PackageParser.java

diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index b8eb074..cfa7af8 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -95,6 +95,7 @@
 import com.android.internal.os.ClassLoaderFactory;
 import com.android.internal.util.ArrayUtils;
 import com.android.internal.util.XmlUtils;
+import com.android.server.SystemConfig;
 
 import libcore.io.IoUtils;
 import libcore.util.EmptyArray;
@@ -640,9 +641,12 @@
     private static boolean checkUseInstalledOrHidden(int flags, PackageUserState state,
             ApplicationInfo appInfo) {
         // Returns false if the package is hidden system app until installed.
-        if ((flags & PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS) == 0
-                && !state.installed
-                && appInfo != null && appInfo.isSystemApp()) {
+        final ArraySet<String> hiddenSystemApps =
+                SystemConfig.getInstance().getDisabledUntilUsedPreinstalledCarrierApps();
+        if (!state.installed
+                && appInfo != null && appInfo.isSystemApp()
+                && hiddenSystemApps.contains(appInfo.packageName)
+                && (flags & PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS) == 0) {
             return false;
         }