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

am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev

Browse Source 
* commit '01dbfbf9c3e14253b7c3a2e822c55c013d0e4b17':
  Permit deactivation of malformed Device Admins.
This commit is contained in:
Alex Klyubin
2013-06-06 15:28:53 -07:00
committed by Android Git Automerger
parent 0ffbbad5b1 01dbfbf9c3
commit 089d161588
1 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,7 +116,10 @@ public class DeviceAdminAdd extends Activity {
return; 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( List<ResolveInfo> avail = getPackageManager().queryBroadcastReceivers(
new Intent(DeviceAdminReceiver.ACTION_DEVICE_ADMIN_ENABLED), new Intent(DeviceAdminReceiver.ACTION_DEVICE_ADMIN_ENABLED),
0); 0);
@@ -145,6 +148,7 @@ public class DeviceAdminAdd extends Activity {
finish(); finish();
return; return;
} }
}
ResolveInfo ri = new ResolveInfo(); ResolveInfo ri = new ResolveInfo();
ri.activityInfo = ai; ri.activityInfo = ai;