commit 5435511ee9151dbca8ad13656b3dc20ec79f940b
author Dianne Hackborn <hackbod@google.com> Tue Feb 16 20:40:42 2010 -0800
committer Dianne Hackborn <hackbod@google.com> Wed Feb 17 10:32:37 2010 -0800
tree caa0e306cdfcb3e4c942ff84e967c3194d5c1e26
parent c4764d24837cf297440f0ee97fe8adb943c56fe0

Fix issue #2420412: API review: DeviceAdmin API changes

src/com/android/settings/DeviceAdminAdd.java

diff --git a/src/com/android/settings/DeviceAdminAdd.java b/src/com/android/settings/DeviceAdminAdd.java
index 94cf714..126af6b 100644
--- a/src/com/android/settings/DeviceAdminAdd.java
+++ b/src/com/android/settings/DeviceAdminAdd.java
@@ -20,7 +20,7 @@
 
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.DeviceAdmin;
+import android.app.DeviceAdminReceiver;
 import android.app.DeviceAdminInfo;
 import android.app.DevicePolicyManager;
 import android.app.Dialog;
@@ -146,14 +146,16 @@
                         @Override
                         protected void onResult(Bundle bundle) {
                             CharSequence msg = bundle != null
-                                    ? bundle.getCharSequence(DeviceAdmin.EXTRA_DISABLE_WARNING)
+                                    ? bundle.getCharSequence(
+                                            DeviceAdminReceiver.EXTRA_DISABLE_WARNING)
                                     : null;
                             if (msg == null) {
                                 mDPM.removeActiveAdmin(mDeviceAdmin.getComponent());
                                 finish();
                             } else {
                                 Bundle args = new Bundle();
-                                args.putCharSequence(DeviceAdmin.EXTRA_DISABLE_WARNING, msg);
+                                args.putCharSequence(
+                                        DeviceAdminReceiver.EXTRA_DISABLE_WARNING, msg);
                                 showDialog(DIALOG_WARNING, args);
                             }
                         }
@@ -173,7 +175,7 @@
     protected Dialog onCreateDialog(int id, Bundle args) {
         switch (id) {
             case DIALOG_WARNING: {
-                CharSequence msg = args.getCharSequence(DeviceAdmin.EXTRA_DISABLE_WARNING);
+                CharSequence msg = args.getCharSequence(DeviceAdminReceiver.EXTRA_DISABLE_WARNING);
                 AlertDialog.Builder builder = new AlertDialog.Builder(
                         DeviceAdminAdd.this);
                 builder.setMessage(msg);

src/com/android/settings/DeviceAdminSettings.java

diff --git a/src/com/android/settings/DeviceAdminSettings.java b/src/com/android/settings/DeviceAdminSettings.java
index a36fc8a..d866966 100644
--- a/src/com/android/settings/DeviceAdminSettings.java
+++ b/src/com/android/settings/DeviceAdminSettings.java
@@ -20,7 +20,7 @@
 
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.DeviceAdmin;
+import android.app.DeviceAdminReceiver;
 import android.app.DeviceAdminInfo;
 import android.app.DevicePolicyManager;
 import android.app.Dialog;
@@ -85,7 +85,7 @@
         
         mAvailableAdmins.clear();
         List<ResolveInfo> avail = getPackageManager().queryBroadcastReceivers(
-                new Intent(DeviceAdmin.ACTION_DEVICE_ADMIN_ENABLED),
+                new Intent(DeviceAdminReceiver.ACTION_DEVICE_ADMIN_ENABLED),
                 PackageManager.GET_META_DATA);
         int count = avail == null ? 0 : avail.size();
         for (int i=0; i<count; i++) {