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

am 749e7eec: am 05a10c60: am fca31ca4: Follow API change from *Blocked to *Hidden

Browse Source 
* commit '749e7eec390c4f3dd417587318f43dfe859da52d':
  Follow API change from *Blocked to *Hidden
This commit is contained in:
Amith Yamasani
2014-07-21 22:37:10 +00:00
committed by Android Git Automerger
parent f4e7435416 749e7eec39
commit d1f0e74204
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -386,12 +386,12 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
Log.d(TAG, "Installing " + packageName);
}
}
if (info != null && (info.flags&ApplicationInfo.FLAG_BLOCKED) != 0
if (info != null && (info.flags&ApplicationInfo.FLAG_HIDDEN) != 0
&& (info.flags&ApplicationInfo.FLAG_INSTALLED) != 0) {
disableUiForPackage(packageName);
mIPm.setApplicationBlockedSettingAsUser(packageName, false, userId);
mIPm.setApplicationHiddenSettingAsUser(packageName, false, userId);
if (DEBUG) {
Log.d(TAG, "Unblocking " + packageName);
Log.d(TAG, "Unhiding " + packageName);
}
}
} catch (RemoteException re) {
@@ -409,9 +409,9 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
}
} else {
disableUiForPackage(packageName);
mIPm.setApplicationBlockedSettingAsUser(packageName, true, userId);
mIPm.setApplicationHiddenSettingAsUser(packageName, true, userId);
if (DEBUG) {
Log.d(TAG, "Blocking " + packageName);
Log.d(TAG, "Hiding " + packageName);
}
}
}
@@ -653,9 +653,9 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
private boolean isAppEnabledForUser(PackageInfo pi) {
if (pi == null) return false;
final int flags = pi.applicationInfo.flags;
// Return true if it is installed and not blocked
// Return true if it is installed and not hidden
return ((flags&ApplicationInfo.FLAG_INSTALLED) != 0
&& (flags&ApplicationInfo.FLAG_BLOCKED) == 0);
&& (flags&ApplicationInfo.FLAG_HIDDEN) == 0);
}
private void populateApps() {