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

Commit 630922b0 authored by Irina Dumitrescu's avatar Irina Dumitrescu Committed by android-build-merger
Browse files

Merge "The AdminSupportDetails intent creation preserves the original admin... 

Merge "The AdminSupportDetails intent creation preserves the original admin user ID." into qt-dev am: bad4ff67
am: 6384c53a

Change-Id: I1653c9e899f2fd38c7976ab26e2a02ade948d600
parents f2f60bab 6384c53a

packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java

+1 −4
Original line number Diff line number Diff line
@@ -92,10 +92,7 @@ public class RestrictedLockUtils { 
            if (admin.component != null) {

                intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, admin.component);

            }

            final UserHandle adminUser = admin.user != null

                    ? admin.user

                    : UserHandle.of(UserHandle.myUserId());

            intent.putExtra(Intent.EXTRA_USER, adminUser);

            intent.putExtra(Intent.EXTRA_USER, admin.user);

        }

        return intent;

    }