commit 36d6817cb50b49d13fb74e58f04589658700301c
author Marc Blank <mblank@google.com> Mon Apr 19 11:43:21 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Apr 19 11:43:21 2010 -0700
tree 386accde06be8a3ed73a0070617b3db493ac6990
parent 6c1971f825c96e441f1dba177ed44e1fec17cdc3
parent 51a54f84f158cd9c18960170197f74a56b54fcd1

am 51a54f84: am 075d3494: Add admin check before trying a remote wipe

Merge commit '51a54f84f158cd9c18960170197f74a56b54fcd1' into kraken

* commit '51a54f84f158cd9c18960170197f74a56b54fcd1':
  Add admin check before trying a remote wipe

src/com/android/exchange/EasSyncService.java

diff --git a/src/com/android/exchange/EasSyncService.java b/src/com/android/exchange/EasSyncService.java
index 43ebb2d..4399d50 100644
--- a/src/com/android/exchange/EasSyncService.java
+++ b/src/com/android/exchange/EasSyncService.java
@@ -1180,6 +1180,8 @@
             }
             if (pp.getRemoteWipe()) {
                 // We've gotten a remote wipe command
+                // If we're not the admin, we can't do the wipe, so just return
+                if (!sp.isActiveAdmin()) return false;
                 // First, we've got to acknowledge it, but wrap the wipe in try/catch so that
                 // we wipe the device regardless of any errors in acknowledgment
                 try {