From fe9059b11dae4823e4b4e4733039f9686594dc97 Mon Sep 17 00:00:00 2001
From: "Philip P. Moltmann" <moltmann@google.com>
Date: Mon, 8 Oct 2018 15:56:51 -0700
Subject: [PATCH] Also all EXTRA_USER as input for
 ACTION_SHOW_ADMIN_SUPPORT_DETAILS

Test: Built
Bug: 116798569
Change-Id: Idbb1e7c6efbde57c00e96d7d9a2aefb233b94586
---
 .../enterprise/ActionDisabledByAdminDialog.java      | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/enterprise/ActionDisabledByAdminDialog.java b/src/com/android/settings/enterprise/ActionDisabledByAdminDialog.java
index 11427661cdb..717c5bcd757 100644
--- a/src/com/android/settings/enterprise/ActionDisabledByAdminDialog.java
+++ b/src/com/android/settings/enterprise/ActionDisabledByAdminDialog.java
@@ -59,11 +59,15 @@ public class ActionDisabledByAdminDialog extends Activity
         }
         admin.component = intent.getParcelableExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN);
 
-        int userId = intent.getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
-        if (userId == UserHandle.USER_NULL) {
-            admin.user = null;
+        if (intent.hasExtra(Intent.EXTRA_USER)) {
+            admin.user = intent.getParcelableExtra(Intent.EXTRA_USER);
         } else {
-            admin.user = UserHandle.of(userId);
+            int userId = intent.getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
+            if (userId == UserHandle.USER_NULL) {
+                admin.user = null;
+            } else {
+                admin.user = UserHandle.of(userId);
+            }
         }
         return admin;
     }