diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-02-17 10:56:58 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-17 10:56:58 -0800 |
| commit | dfac9a643e261896768cd68e8e7476a31c70b345 (patch) | |
| tree | e7ac7954559a55b0fd1ca7067eb3b97c4aabc040 /services | |
| parent | 2d9dca100f0a9c493ffe3381f35d4600edd74b19 (diff) | |
| parent | ef6b22fc04a8d5ab26e13efac8069c097e0da7c9 (diff) | |
| download | frameworks_base-dfac9a643e261896768cd68e8e7476a31c70b345.zip frameworks_base-dfac9a643e261896768cd68e8e7476a31c70b345.tar.gz frameworks_base-dfac9a643e261896768cd68e8e7476a31c70b345.tar.bz2 | |
Merge "Fix issue #2420412: API review: DeviceAdmin API changes"
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/DevicePolicyManagerService.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/services/java/com/android/server/DevicePolicyManagerService.java b/services/java/com/android/server/DevicePolicyManagerService.java index 0a6c72e..a267e0f 100644 --- a/services/java/com/android/server/DevicePolicyManagerService.java +++ b/services/java/com/android/server/DevicePolicyManagerService.java @@ -24,7 +24,7 @@ import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlSerializer; import android.app.Activity; -import android.app.DeviceAdmin; +import android.app.DeviceAdminReceiver; import android.app.DeviceAdminInfo; import android.app.DevicePolicyManager; import android.app.IDevicePolicyManager; @@ -216,7 +216,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { ActiveAdmin admin = getActiveAdminUncheckedLocked(adminReceiver); if (admin != null) { sendAdminCommandLocked(admin, - DeviceAdmin.ACTION_DEVICE_ADMIN_DISABLED); + DeviceAdminReceiver.ACTION_DEVICE_ADMIN_DISABLED); // XXX need to wait for it to complete. mAdminList.remove(admin); mAdminMap.remove(adminReceiver); @@ -393,7 +393,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { mAdminList.add(admin); saveSettingsLocked(); sendAdminCommandLocked(admin, - DeviceAdmin.ACTION_DEVICE_ADMIN_ENABLED); + DeviceAdminReceiver.ACTION_DEVICE_ADMIN_ENABLED); } finally { Binder.restoreCallingIdentity(ident); } @@ -709,7 +709,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } return; } - Intent intent = new Intent(DeviceAdmin.ACTION_DEVICE_ADMIN_DISABLE_REQUESTED); + Intent intent = new Intent(DeviceAdminReceiver.ACTION_DEVICE_ADMIN_DISABLE_REQUESTED); intent.setComponent(admin.info.getComponent()); mContext.sendOrderedBroadcast(intent, null, new BroadcastReceiver() { @Override @@ -738,7 +738,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { mFailedPasswordAttempts = 0; saveSettingsLocked(); } - sendAdminCommandLocked(DeviceAdmin.ACTION_PASSWORD_CHANGED, + sendAdminCommandLocked(DeviceAdminReceiver.ACTION_PASSWORD_CHANGED, DeviceAdminInfo.USES_POLICY_LIMIT_PASSWORD); } finally { Binder.restoreCallingIdentity(ident); @@ -760,7 +760,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { if (max > 0 && mFailedPasswordAttempts >= max) { wipeDataLocked(0); } - sendAdminCommandLocked(DeviceAdmin.ACTION_PASSWORD_FAILED, + sendAdminCommandLocked(DeviceAdminReceiver.ACTION_PASSWORD_FAILED, DeviceAdminInfo.USES_POLICY_WATCH_LOGIN); } finally { Binder.restoreCallingIdentity(ident); @@ -778,7 +778,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { try { mFailedPasswordAttempts = 0; saveSettingsLocked(); - sendAdminCommandLocked(DeviceAdmin.ACTION_PASSWORD_SUCCEEDED, + sendAdminCommandLocked(DeviceAdminReceiver.ACTION_PASSWORD_SUCCEEDED, DeviceAdminInfo.USES_POLICY_WATCH_LOGIN); } finally { Binder.restoreCallingIdentity(ident); |