Merge "Fix device administrator "add" logic"

src/com/android/settings/DeviceAdminAdd.java

@@ -140,7 +140,7 @@ public class DeviceAdminAdd extends Activity {
                     mDPM.setActiveAdmin(mDeviceAdmin.getComponent());
                     setResult(Activity.RESULT_OK);
                     finish();
-                }
+                } else {
                     mDPM.getRemoveWarning(mDeviceAdmin.getComponent(),
                             new RemoteCallback(mHandler) {
                         @Override
@@ -159,6 +159,7 @@ public class DeviceAdminAdd extends Activity {
                         }
                     });
                 }
+            }
         });
     }