diff options
| author | Amith Yamasani <yamasani@google.com> | 2014-07-19 15:57:34 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2014-07-21 22:19:09 +0000 |
| commit | fca31ca418ec9c8d09efd18d7616b816a3e9f94a (patch) | |
| tree | 4d3df54282c7092e1fa8067afc15de00ba303bec /src/com/android | |
| parent | fecda6181dcb4197268fd9846cf01207f5ae3249 (diff) | |
| download | packages_apps_Settings-fca31ca418ec9c8d09efd18d7616b816a3e9f94a.zip packages_apps_Settings-fca31ca418ec9c8d09efd18d7616b816a3e9f94a.tar.gz packages_apps_Settings-fca31ca418ec9c8d09efd18d7616b816a3e9f94a.tar.bz2 | |
Follow API change from *Blocked to *Hidden
Bug: 16191518
Change-Id: I4cbe210e62d551e4d5246eb3a7523d03c41175be
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/settings/users/AppRestrictionsFragment.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java index d1a5de3..56368ef 100644 --- a/src/com/android/settings/users/AppRestrictionsFragment.java +++ b/src/com/android/settings/users/AppRestrictionsFragment.java @@ -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() { |