commit fca31ca418ec9c8d09efd18d7616b816a3e9f94a
author Amith Yamasani <yamasani@google.com> Sat Jul 19 15:57:34 2014 -0700
committer Amith Yamasani <yamasani@google.com> Mon Jul 21 22:19:09 2014 +0000
tree 4d3df54282c7092e1fa8067afc15de00ba303bec
parent fecda6181dcb4197268fd9846cf01207f5ae3249

Follow API change from *Blocked to *Hidden

Bug: 16191518
Change-Id: I4cbe210e62d551e4d5246eb3a7523d03c41175be

src/com/android/settings/users/AppRestrictionsFragment.java

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 @@
                         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 @@
                         }
                     } 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 @@
     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() {