commit 0c6929ec046119c3b360dcf2e66c64306ea1c61b
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 04 23:27:42 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 04 23:27:42 2018 +0000
tree 972df7b805ceb8306d613642fdc2ba434af7843a
parent 9b5267f91483203174c05f3d247c1e15a6f52edc
parent 4da326c0d6e9ab78ceca654e13bcbc05bc671c09

Merge "Revert "Update checking of flag MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS"" into pi-dev

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 cfa7af8..b8eb074 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -95,7 +95,6 @@
 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;
@@ -641,12 +640,9 @@
     private static boolean checkUseInstalledOrHidden(int flags, PackageUserState state,
             ApplicationInfo appInfo) {
         // Returns false if the package is hidden system app until installed.
-        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) {
+        if ((flags & PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS) == 0
+                && !state.installed
+                && appInfo != null && appInfo.isSystemApp()) {
             return false;
         }