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

Commit efd88e2c authored by Alex Klyubin's avatar Alex Klyubin Committed by Android (Google) Code Review
Browse files

Merge "Permit deactivation of malformed Device Admins." into jb-dev

parents 3dddd8cb 29de9d51

src/com/android/settings/DeviceAdminAdd.java

+30 −26
Original line number Diff line number Diff line
@@ -116,7 +116,10 @@ public class DeviceAdminAdd extends Activity { 
            return;

        }



        // Make sure the given component name is actually a valid device admin.

        // When activating, make sure the given component name is actually a valid device admin.

        // No need to check this when deactivating, because it is safe to deactivate an active

        // invalid device admin.

        if (!mDPM.isAdminActive(cn)) {

            List<ResolveInfo> avail = getPackageManager().queryBroadcastReceivers(

                    new Intent(DeviceAdminReceiver.ACTION_DEVICE_ADMIN_ENABLED),

                    0);
@@ -145,6 +148,7 @@ public class DeviceAdminAdd extends Activity { 
                finish();

                return;

            }

        }



        ResolveInfo ri = new ResolveInfo();

        ri.activityInfo = ai;