commit 49d20fa68e9f716de126f146c446f36c0d7105f3
author Ayush Sharma <ayushsha@google.com> Fri Aug 13 16:38:59 2021 +0000
committer Ayush Sharma <ayushsha@google.com> Thu Sep 16 12:13:21 2021 +0000
tree 27d2e9110b4cea52a8070c3c86c7a770fa7d0a6a
parent cb1969d46b80eb179416c50367eb5b8f483395f7

Fetch admin details if not present in Intent.

Get admin package/user details if this info is not present in the
intent(ACTION_SHOW_ADMIN_SUPPORT_DETAILS) received

Bug: 192245204
Test: atest MixedDeviceOwnerTest#testCreateAdminSupportIntent
      atest MixedProfileOwnerTest#testCreateAdminSupportIntent
      atest MixedManagedProfileOwnerTest#testCreateAdminSupportIntent

Change-Id: Idda6078a64c03588f0b786ebc79079198ab722fe
Merged-In: Idda6078a64c03588f0b786ebc79079198ab722fe

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 ce7ad24..c4bef25 100644
--- a/src/com/android/settings/enterprise/ActionDisabledByAdminDialog.java
+++ b/src/com/android/settings/enterprise/ActionDisabledByAdminDialog.java
@@ -58,11 +58,25 @@
             return admin;
         }
         admin.component = intent.getParcelableExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN);
+        int userId = intent.getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
+
+        Bundle adminDetails = null;
+        if (admin.component == null) {
+            DevicePolicyManager devicePolicyManager = getSystemService(DevicePolicyManager.class);
+            adminDetails = devicePolicyManager.getEnforcingAdminAndUserDetails(userId,
+                    getRestrictionFromIntent(intent));
+            if (adminDetails != null) {
+                admin.component = adminDetails.getParcelable(
+                        DevicePolicyManager.EXTRA_DEVICE_ADMIN);
+            }
+        }
 
         if (intent.hasExtra(Intent.EXTRA_USER)) {
             admin.user = intent.getParcelableExtra(Intent.EXTRA_USER);
         } else {
-            int userId = intent.getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
+            if (adminDetails != null) {
+                userId = adminDetails.getInt(Intent.EXTRA_USER_ID, UserHandle.myUserId());
+            }
             if (userId == UserHandle.USER_NULL) {
                 admin.user = null;
             } else {