am 8bfb859e
: am 8d5aeffa
: am 089d1615
: am 01dbfbf9
: am efd88e2c
: Merge "Permit deactivation of malformed Device Admins." into jb-dev
* commit '8bfb859e3b81a9b6448c17cfb02a0aa748580231': Permit deactivation of malformed Device Admins.
This commit is contained in:
@@ -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;
|
||||
|
Reference in New Issue
Block a user