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

Commit 681b21f3 authored by Alex Klyubin's avatar Alex Klyubin
Browse files

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

Change-Id: If371a4571c5440ce2a0b4339f97893bf78832b31
parents 56604046 5d21820a

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),

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

                return;

            }

        }



        ResolveInfo ri = new ResolveInfo();

        ri.activityInfo = ai;