Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "The AdminSupportDetails intent creation preserves the original admin user ID." into qt-dev

Browse Source 
am: bad4ff67dd

Change-Id: Icc5b3cbe98877dc327d582e44291c20e564a0f69
This commit is contained in:
Irina Dumitrescu
2019-05-10 12:11:24 -07:00
committed by android-build-merger
parent f61a947bcf bad4ff67dd
commit 6384c53ad4
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java
View File

@@ -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;
}