commit c496feec04f124249c4b9b80bbf0fc05ccf99402
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Oct 17 00:26:37 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 17 00:26:37 2018 +0000
tree 6b568e1e6882bae2a88e7d0e8d612b5b9a56fe74
parent 9c072cd6217a8872fcfcd9d9ddffb90124bd68f0
parent fe9059b11dae4823e4b4e4733039f9686594dc97

Merge "Also all EXTRA_USER as input for ACTION_SHOW_ADMIN_SUPPORT_DETAILS"

src/com/android/settings/enterprise/ActionDisabledByAdminDialog.java

diff --git a/src/com/android/settings/enterprise/ActionDisabledByAdminDialog.java b/src/com/android/settings/enterprise/ActionDisabledByAdminDialog.java
index 1142766..717c5bc 100644
--- a/src/com/android/settings/enterprise/ActionDisabledByAdminDialog.java
+++ b/src/com/android/settings/enterprise/ActionDisabledByAdminDialog.java
@@ -59,11 +59,15 @@
         }
         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;
     }