commit d34718b6b95086c34b4813525e6000064460e3a1
author Esteban Talavera <etalavera@google.com> Mon Feb 22 13:25:14 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 22 13:25:15 2016 +0000
tree 2777b5fd7d0cfca062d05e7c85b4621441cc6f98
parent fa272e5c9262bc974d68139a6300ecdbf94f0767
parent 552a561b5c73398a3159e569eb1e9b57793932e2

Merge "Updated removeActiveAdmin documentation" into nyc-dev

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

diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index ae63a2f..820e0e8 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -1059,6 +1059,9 @@
      * by the application that owns the administration component; if you
      * try to remove someone else's component, a security exception will be
      * thrown.
+     *
+     * <p>Note that the operation is not synchronous and the admin might still be active (as
+     * indicated by {@link #getActiveAdmins()}) by the time this method returns.
      */
     public void removeActiveAdmin(@NonNull ComponentName admin) {
         if (mService != null) {