diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-02-16 20:40:42 -0800 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-02-17 10:32:37 -0800 |
| commit | 5435511ee9151dbca8ad13656b3dc20ec79f940b (patch) | |
| tree | caa0e306cdfcb3e4c942ff84e967c3194d5c1e26 /src/com/android/settings/DeviceAdminAdd.java | |
| parent | c4764d24837cf297440f0ee97fe8adb943c56fe0 (diff) | |
| download | packages_apps_Settings-5435511ee9151dbca8ad13656b3dc20ec79f940b.zip packages_apps_Settings-5435511ee9151dbca8ad13656b3dc20ec79f940b.tar.gz packages_apps_Settings-5435511ee9151dbca8ad13656b3dc20ec79f940b.tar.bz2 | |
Fix issue #2420412: API review: DeviceAdmin API changes
Diffstat (limited to 'src/com/android/settings/DeviceAdminAdd.java')
| -rw-r--r-- | src/com/android/settings/DeviceAdminAdd.java | 10 |
1 files changed, 6 insertions, 4 deletions
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 org.xmlpull.v1.XmlPullParserException; 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 @@ public class DeviceAdminAdd extends Activity { @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 @@ public class DeviceAdminAdd extends Activity { 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); |