commit 93fd30f9c7752d0336d3b26be68abe9f85678ce1
author Andy Stadler <stadler@google.com> Fri Feb 05 10:47:04 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 05 10:47:04 2010 -0800
tree 11b734d5bb8e7327700939514a68fcfdff92c0e9
parent 8b3ca621be63cf1f32fa7f2139e21eaaa2e32001
parent 4df6edb1acefcd927932b7c1cb71575298d53b86

Merge "Fix device administrator "add" logic"

src/com/android/settings/DeviceAdminAdd.java

diff --git a/src/com/android/settings/DeviceAdminAdd.java b/src/com/android/settings/DeviceAdminAdd.java
index 03db9ce..94cf714 100644
--- a/src/com/android/settings/DeviceAdminAdd.java
+++ b/src/com/android/settings/DeviceAdminAdd.java
@@ -140,24 +140,25 @@
                     mDPM.setActiveAdmin(mDeviceAdmin.getComponent());
                     setResult(Activity.RESULT_OK);
                     finish();
-                }
-                mDPM.getRemoveWarning(mDeviceAdmin.getComponent(),
-                        new RemoteCallback(mHandler) {
-                    @Override
-                    protected void onResult(Bundle bundle) {
-                        CharSequence msg = bundle != null
-                                ? bundle.getCharSequence(DeviceAdmin.EXTRA_DISABLE_WARNING)
-                                : null;
-                        if (msg == null) {
-                            mDPM.removeActiveAdmin(mDeviceAdmin.getComponent());
-                            finish();
-                        } else {
-                            Bundle args = new Bundle();
-                            args.putCharSequence(DeviceAdmin.EXTRA_DISABLE_WARNING, msg);
-                            showDialog(DIALOG_WARNING, args);
+                } else {
+                    mDPM.getRemoveWarning(mDeviceAdmin.getComponent(),
+                            new RemoteCallback(mHandler) {
+                        @Override
+                        protected void onResult(Bundle bundle) {
+                            CharSequence msg = bundle != null
+                                    ? bundle.getCharSequence(DeviceAdmin.EXTRA_DISABLE_WARNING)
+                                    : null;
+                            if (msg == null) {
+                                mDPM.removeActiveAdmin(mDeviceAdmin.getComponent());
+                                finish();
+                            } else {
+                                Bundle args = new Bundle();
+                                args.putCharSequence(DeviceAdmin.EXTRA_DISABLE_WARNING, msg);
+                                showDialog(DIALOG_WARNING, args);
+                            }
                         }
-                    }
-                });
+                    });
+                }
             }
         });
     }