From cc254f4da96506901268c4a0b1d3cfacb5f44948 Mon Sep 17 00:00:00 2001 From: Alex Klyubin Date: Wed, 4 Feb 2015 08:47:12 -0800 Subject: [PATCH] Hidden ApplicationInfo flags are now in privateFlags. See b9f8a5204a1b0b3919fa921e858d04124c582828. Change-Id: I98bbe4b1a5ac0939e0000e4da8b21a1964c75e8b --- src/com/android/settings/search/Index.java | 3 ++- src/com/android/settings/users/AppRestrictionsFragment.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/search/Index.java b/src/com/android/settings/search/Index.java index 3957cf633b0..5dbf24f0053 100644 --- a/src/com/android/settings/search/Index.java +++ b/src/com/android/settings/search/Index.java @@ -448,7 +448,8 @@ public class Index { final PackageManager pm = mContext.getPackageManager(); try { PackageInfo packInfo = pm.getPackageInfo(packageName, 0); - return ((packInfo.applicationInfo.flags & ApplicationInfo.FLAG_PRIVILEGED) != 0); + return ((packInfo.applicationInfo.privateFlags + & ApplicationInfo.PRIVATE_FLAG_PRIVILEGED) != 0); } catch (PackageManager.NameNotFoundException e) { return false; } diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java index 9eee4accc4b..32233891a49 100644 --- a/src/com/android/settings/users/AppRestrictionsFragment.java +++ b/src/com/android/settings/users/AppRestrictionsFragment.java @@ -370,7 +370,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen Log.d(TAG, "Installing " + packageName); } } - if (info != null && (info.flags&ApplicationInfo.FLAG_HIDDEN) != 0 + if (info != null && (info.privateFlags&ApplicationInfo.PRIVATE_FLAG_HIDDEN) != 0 && (info.flags&ApplicationInfo.FLAG_INSTALLED) != 0) { disableUiForPackage(packageName); mIPm.setApplicationHiddenSettingAsUser(packageName, false, userId); @@ -637,9 +637,10 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen private boolean isAppEnabledForUser(PackageInfo pi) { if (pi == null) return false; final int flags = pi.applicationInfo.flags; + final int privateFlags = pi.applicationInfo.privateFlags; // Return true if it is installed and not hidden return ((flags&ApplicationInfo.FLAG_INSTALLED) != 0 - && (flags&ApplicationInfo.FLAG_HIDDEN) == 0); + && (privateFlags&ApplicationInfo.PRIVATE_FLAG_HIDDEN) == 0); } private void populateApps() {