Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 513c783b authored by Makoto Onuki's avatar Makoto Onuki Committed by android-build-merger
Browse files

Merge "Don\'t allow removing admin to be added again" into nyc-dev 

am: 547fc398

* commit '547fc398':
  Don't allow removing admin to be added again

Change-Id: Ib44dc27ab2be9c0bd8298162cf64776090021d35
parents 29eeaf95 547fc398

src/com/android/settings/DeviceAdminAdd.java

+6 −0
Original line number Diff line number Diff line
@@ -245,6 +245,12 @@ public class DeviceAdminAdd extends Activity { 
        if (DevicePolicyManager.ACTION_ADD_DEVICE_ADMIN.equals(getIntent().getAction())) {

            mRefreshing = false;

            if (mDPM.isAdminActive(who)) {

                if (mDPM.isRemovingAdmin(who, android.os.Process.myUserHandle().getIdentifier())) {

                    Log.w(TAG, "Requested admin is already being removed: " + who);

                    finish();

                    return;

                }



                ArrayList<DeviceAdminInfo.PolicyInfo> newPolicies = mDeviceAdmin.getUsedPolicies();

                for (int i = 0; i < newPolicies.size(); i++) {

                    DeviceAdminInfo.PolicyInfo pi = newPolicies.get(i);