Merge "Set EXTRA_USER instead of EXTRA_USER_ID for ACTION_SHOW_ADMIN_SUPPORT_DETAILS"

1 files changed, 4 insertions, 5 deletions

diff --git a/packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java b/packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java
index e278c10a2c59..8529e3ef8420 100644
--- a/packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java
+++ b/packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java
@@ -80,11 +80,10 @@ public class RestrictedLockUtils {
             if (admin.component != null) {
                 intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, admin.component);
             }
-            int adminUserId = UserHandle.myUserId();
-            if (admin.user != null) {
-                adminUserId = admin.user.getIdentifier();
-            }
-            intent.putExtra(Intent.EXTRA_USER_ID, adminUserId);
+            final UserHandle adminUser = admin.user != null
+                    ? admin.user
+                    : UserHandle.of(UserHandle.myUserId());
+            intent.putExtra(Intent.EXTRA_USER, adminUser);
         }
         return intent;
     }