Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de8f0912 authored by Andrew Sapperstein's avatar Andrew Sapperstein Committed by android-build-merger
Browse files

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

am: 0c6929ec

Change-Id: I2f1c4b07946290e3adde90af82b6f7a2ec55f2b1
parents bbb033e6 0c6929ec

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

+3 −7
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ import com.android.internal.annotations.VisibleForTesting; 
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 @@ public class PackageParser { 
    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;

        }