From aa2d705440d0ca3c7fdb2601268dec5806b32c0a Mon Sep 17 00:00:00 2001
From: Irina Dumitrescu <irinaid@google.com>
Date: Wed, 8 May 2019 21:27:23 +0100
Subject: [PATCH] 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
---
 .../src/com/android/settingslib/RestrictedLockUtils.java     | 5 +----
 1 file changed, 1 insertion(+), 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 4f4aef0b0fae9..fa2ec55bd81a2 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;
     }