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

am fca31ca4: Follow API change from *Blocked to *Hidden

Browse Source 
* commit 'fca31ca418ec9c8d09efd18d7616b816a3e9f94a':
  Follow API change from *Blocked to *Hidden
This commit is contained in:
Amith Yamasani
2014-07-21 22:25:17 +00:00
committed by Android Git Automerger
parent c8c4b092e9 fca31ca418
commit 05a10c6088
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); 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) { && (info.flags&ApplicationInfo.FLAG_INSTALLED) != 0) {
disableUiForPackage(packageName); disableUiForPackage(packageName);
mIPm.setApplicationBlockedSettingAsUser(packageName, false, userId); mIPm.setApplicationHiddenSettingAsUser(packageName, false, userId);
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "Unblocking " + packageName); Log.d(TAG, "Unhiding " + packageName);
} }
} }
} catch (RemoteException re) { } catch (RemoteException re) {
@@ -409,9 +409,9 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
} }
} else { } else {
disableUiForPackage(packageName); disableUiForPackage(packageName);
mIPm.setApplicationBlockedSettingAsUser(packageName, true, userId); mIPm.setApplicationHiddenSettingAsUser(packageName, true, userId);
if (DEBUG) { 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) { 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;
// Return true if it is installed and not blocked // Return true if it is installed and not hidden
return ((flags&ApplicationInfo.FLAG_INSTALLED) != 0 return ((flags&ApplicationInfo.FLAG_INSTALLED) != 0
&& (flags&ApplicationInfo.FLAG_BLOCKED) == 0); && (flags&ApplicationInfo.FLAG_HIDDEN) == 0);
} }
private void populateApps() { private void populateApps() {