PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix device administrator "add" logic

Browse Source 
Due to a missing "else" the logic to activate a device administrator
was immediately falling through into the logic to remove it.  As a result,
the add was immediately countermanded by a remove.
This commit is contained in:
Andrew Stadler
2010-02-05 01:00:13 -08:00
parent c4e8d7e21a
commit 4df6edb1ac
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/com/android/settings/DeviceAdminAdd.java
View File

@@ -140,24 +140,25 @@ public class DeviceAdminAdd extends Activity {
mDPM.setActiveAdmin(mDeviceAdmin.getComponent()); mDPM.setActiveAdmin(mDeviceAdmin.getComponent());
setResult(Activity.RESULT_OK); setResult(Activity.RESULT_OK);
finish(); finish();
} } else {
mDPM.getRemoveWarning(mDeviceAdmin.getComponent(), mDPM.getRemoveWarning(mDeviceAdmin.getComponent(),
new RemoteCallback(mHandler) { new RemoteCallback(mHandler) {
@Override @Override
protected void onResult(Bundle bundle) { protected void onResult(Bundle bundle) {
CharSequence msg = bundle != null CharSequence msg = bundle != null
? bundle.getCharSequence(DeviceAdmin.EXTRA_DISABLE_WARNING) ? bundle.getCharSequence(DeviceAdmin.EXTRA_DISABLE_WARNING)
: null; : null;
if (msg == null) { if (msg == null) {
mDPM.removeActiveAdmin(mDeviceAdmin.getComponent()); mDPM.removeActiveAdmin(mDeviceAdmin.getComponent());
finish(); finish();
} else { } else {
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putCharSequence(DeviceAdmin.EXTRA_DISABLE_WARNING, msg); args.putCharSequence(DeviceAdmin.EXTRA_DISABLE_WARNING, msg);
showDialog(DIALOG_WARNING, args); showDialog(DIALOG_WARNING, args);
}
} }
} });
}); }
} }
}); });
} }