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

The AdminSupportDetails intent creation preserves the original admin user ID.

Browse Source 
When the admin user ID is null, UserHandle.NULL which has value -1000.

Test: atest RestrictedLockUtilsTest
Fixes: 118881180
Change-Id: I4958e168c9b99e16d8640718aefe306a5fb3504b
This commit is contained in:
Irina Dumitrescu
2019-05-08 21:27:23 +01:00
parent c84e33b3f1
commit aa2d705440
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;
}