Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 15ebbeb9fd

Change-Id: I6447f40dae907f63042024ac9558aa9ba6f6f4fd
This commit is contained in:
Jackal Guo
2018-06-04 14:11:44 -07:00
committed by android-build-merger
parent 8a8c971209 15ebbeb9fd
commit 411e733a83
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/content/pm/PackageParser.java
View File

@@ -95,6 +95,7 @@ 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;
@@ -640,9 +641,12 @@ public class PackageParser {
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;
}