commit 10c970c571055c90753d582bb4092cb46e0d099c
author Alex Johnston <acjohnston@google.com> Tue Jun 16 11:05:33 2020 +0100
committer Alex Johnston <acjohnston@google.com> Tue Jun 16 11:05:33 2020 +0100
tree 63d236ca4014ba17c2592bb9825ce11a0112e2e2
parent 82b99f14a21c66f04f2bc9b64147dece2feca080

Wifi details - handle no profile owner

* If there is no profile owner, then do
  no call DPM method getProfileOwnerAsUser

Bug: 158284193
Test: manual testing
      make RunSettingsRoboTests -j ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Change-Id: Ief1f0b3aa6805d69fc14da8f87a90c9b12bef8c6

src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java

diff --git a/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java b/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java
index 1a8ac1d..76a8c5f 100644
--- a/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java
+++ b/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java
@@ -142,8 +142,10 @@
                                 getContext().getSystemService(Context.USER_SERVICE);
                         final int profileOwnerUserId = Utils.getManagedProfileId(
                                 um, UserHandle.myUserId());
-                        admin = new EnforcedAdmin(dpm.getProfileOwnerAsUser(profileOwnerUserId),
-                                null, UserHandle.of(profileOwnerUserId));
+                        if (profileOwnerUserId != UserHandle.USER_NULL) {
+                            admin = new EnforcedAdmin(dpm.getProfileOwnerAsUser(profileOwnerUserId),
+                                    null, UserHandle.of(profileOwnerUserId));
+                        }
                     }
                     RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(), admin);
                 } else {