am e029b91c: am 1d33bca0: Merge "Hidden ApplicationInfo flags are now in privateFlags."

* commit 'e029b91c53323c27ea18a57c6af8c00ecab5576b':
  Hidden ApplicationInfo flags are now in privateFlags.
This commit is contained in:
Alex Klyubin
2015-02-11 19:58:03 +00:00
committed by Android Git Automerger
2 changed files with 5 additions and 3 deletions

View File

@@ -348,7 +348,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);
@@ -615,9 +615,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() {