am d483a85e: am fed2812d: am 22afe626: Merge "Added isRemovingAdmin method" into lmp-mr1-dev

* commit 'd483a85e69c3bb83b25473b93806e063b72c9315':
  Added isRemovingAdmin method

core/java/android/app/admin/DevicePolicyManager.java

@@ -508,6 +508,22 @@ public class DevicePolicyManager {
         }
         return false;
     }
+    /**
+     * Return true if the given administrator component is currently being removed
+     * for the user.
+     * @hide
+     */
+    public boolean isRemovingAdmin(ComponentName who, int userId) {
+        if (mService != null) {
+            try {
+                return mService.isRemovingAdmin(who, userId);
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed talking with device policy service", e);
+            }
+        }
+        return false;
+    }
+
 
     /**
      * Return a list of all currently active device administrator's component

core/java/android/app/admin/IDevicePolicyManager.aidl

@@ -196,4 +196,6 @@ interface IDevicePolicyManager {
 
     void setAutoTimeRequired(in ComponentName who, int userHandle, boolean required);
     boolean getAutoTimeRequired();
+
+    boolean isRemovingAdmin(in ComponentName adminReceiver, int userHandle);
 }