commit dd1d9c4db025c13807e145f845ccf7f4b9231ac1
author Alex Johnston <acjohnston@google.com> Tue Jun 16 19:06:52 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 16 19:06:52 2020 +0000
tree a2cd653564e62ada2112baaadc20405d3f547c6b
parent c622fdc7a9b1349321e907780f2a09fa63d783d0
parent 10c970c571055c90753d582bb4092cb46e0d099c

Merge "Wifi details - handle no profile owner" into rvc-dev

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 {