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

resolved conflicts for merge of 5d21820a to jb-mr2-dev

Browse Source 
Change-Id: If371a4571c5440ce2a0b4339f97893bf78832b31
This commit is contained in:
Alex Klyubin
2013-06-06 15:45:23 -07:00
parent 56604046c5 5d21820a97
commit 681b21f3e4
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),
PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS); PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS);
@@ -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;