diff options
| author | Irina Dumitrescu <irinaid@google.com> | 2019-05-08 21:27:23 +0100 |
|---|---|---|
| committer | Irina Dumitrescu <irinaid@google.com> | 2019-05-09 15:59:28 +0000 |
| commit | aa2d705440d0ca3c7fdb2601268dec5806b32c0a (patch) | |
| tree | b1d9f1d0fa091c5bff7750d45b31f8d6d38dadd0 /packages/SettingsLib/RestrictedLockUtils | |
| parent | c84e33b3f16496c710722039fa0566ae76c6acfc (diff) | |
The AdminSupportDetails intent creation preserves the original admin user ID.
When the admin user ID is null, UserHandle.NULL which has value -1000.
Test: atest RestrictedLockUtilsTest
Fixes: 118881180
Change-Id: I4958e168c9b99e16d8640718aefe306a5fb3504b
Diffstat (limited to 'packages/SettingsLib/RestrictedLockUtils')
| -rw-r--r-- | packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java b/packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java index 4f4aef0b0fae..fa2ec55bd81a 100644 --- a/packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java +++ b/packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java @@ -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; } |