am 1d33bca0: Merge "Hidden ApplicationInfo flags are now in privateFlags." (e029b91c) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/search/Index.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

+3 −2

Original line number	Diff line number	Diff line
		@@ -368,7 +368,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);
		@@ -635,9 +635,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() {