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

Merge commit '075d34947fe2ed402997828794bdd99b59bc79ac' into froyo-plus-aosp

* commit '075d34947fe2ed402997828794bdd99b59bc79ac':
  Add admin check before trying a remote wipe
This commit is contained in:
Marc Blank 2010-04-19 11:40:09 -07:00 committed by Android Git Automerger
commit 51a54f84f1

View File

@ -1180,6 +1180,8 @@ public class EasSyncService extends AbstractSyncService {
}
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 {