PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hidden ApplicationInfo flags are now in privateFlags."

Browse Source
This commit is contained in:
Alex Klyubin
2015-02-11 19:27:24 +00:00
committed by Gerrit Code Review
parent 6317e06635 cc254f4da9
commit 1d33bca0e4
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/search/Index.java
View File

@@ -448,7 +448,8 @@ public class Index {
final PackageManager pm = mContext.getPackageManager(); final PackageManager pm = mContext.getPackageManager();
try { try {
PackageInfo packInfo = pm.getPackageInfo(packageName, 0); 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) { } catch (PackageManager.NameNotFoundException e) {
return false; return false;
} }

5
src/com/android/settings/users/AppRestrictionsFragment.java
View File

@@ -370,7 +370,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
Log.d(TAG, "Installing " + packageName); 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) { && (info.flags&ApplicationInfo.FLAG_INSTALLED) != 0) {
disableUiForPackage(packageName); disableUiForPackage(packageName);
mIPm.setApplicationHiddenSettingAsUser(packageName, false, userId); mIPm.setApplicationHiddenSettingAsUser(packageName, false, userId);
@@ -637,9 +637,10 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
private boolean isAppEnabledForUser(PackageInfo pi) { private boolean isAppEnabledForUser(PackageInfo pi) {
if (pi == null) return false; if (pi == null) return false;
final int flags = pi.applicationInfo.flags; final int flags = pi.applicationInfo.flags;
final int privateFlags = pi.applicationInfo.privateFlags;
// Return true if it is installed and not hidden // Return true if it is installed and not hidden
return ((flags&ApplicationInfo.FLAG_INSTALLED) != 0 return ((flags&ApplicationInfo.FLAG_INSTALLED) != 0
&& (flags&ApplicationInfo.FLAG_HIDDEN) == 0); && (privateFlags&ApplicationInfo.PRIVATE_FLAG_HIDDEN) == 0);
} }
private void populateApps() { private void populateApps() {