Merge "Apps suspension: Use stable API." into ub-testdpc-rvc

Author: eranmes

app/src/main/java/com/afwsamples/testdpc/policy/PolicyManagementFragment.java

@@ -797,37 +797,13 @@ private void maybeUpdateProfileMaxTimeOff() {
 
     @TargetApi(Util.R_VERSION_CODE)
     private void reloadPersonalAppsSuspendedUi() {
-        // TODO: nuke it when R sdk is available
-        final int PERSONAL_APPS_NOT_SUSPENDED = 0;
         if (mSuspendPersonalApps.isEnabled()) {
-            int suspendReasons = getPersonalAppsSuspensionReasons();
+            int suspendReasons =
+                    mDevicePolicyManager.getPersonalAppsSuspendedReasons(mAdminComponentName);
             mSuspendPersonalApps.setChecked(suspendReasons != 0);
         }
     }
 
-    // TODO: nuke it when R sdk is available.
-    int getPersonalAppsSuspensionReasons() {
-        try {
-            return (Integer) ReflectionUtil.invoke(mDevicePolicyManager,
-                    "getPersonalAppsSuspendedReasons", new Class<?>[]{ComponentName.class},
-                    mAdminComponentName);
-        } catch (ReflectionIsTemporaryException e) {
-            logAndShowToast("Error invoking getPersonalAppsSuspendedReasons", e);
-            return 0;
-        }
-    }
-
-    // TODO: nuke it when R sdk is available.
-    void setPersonalAppsSuspended(boolean suspended) {
-        try {
-            ReflectionUtil.invoke(mDevicePolicyManager, "setPersonalAppsSuspended",
-                    new Class<?>[]{ComponentName.class, boolean.class},
-                    mAdminComponentName, suspended);
-        } catch (ReflectionIsTemporaryException e) {
-            logAndShowToast("Error invoking setPersonalAppsSuspended", e);
-        }
-    }
-
     //TODO: nuke it when R sdk is available.
     public long getManagedProfileMaximumTimeOff() {
         try {
@@ -1558,7 +1534,8 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
                 reloadLocationModeUi();
                 return true;
             case SUSPEND_PERSONAL_APPS_KEY:
-                setPersonalAppsSuspended((Boolean) newValue);
+                mDevicePolicyManager.setPersonalAppsSuspended(
+                        mAdminComponentName, (Boolean) newValue);
                 reloadPersonalAppsSuspendedUi();
                 return true;
             case PROFILE_MAX_TIME_OFF_KEY: