From 10c970c571055c90753d582bb4092cb46e0d099c Mon Sep 17 00:00:00 2001 From: Alex Johnston Date: Tue, 16 Jun 2020 11:05:33 +0100 Subject: [PATCH] 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 --- .../settings/wifi/details2/WifiNetworkDetailsFragment2.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java b/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java index 1a8ac1df8f5..76a8c5f9749 100644 --- a/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java +++ b/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java @@ -142,8 +142,10 @@ public class WifiNetworkDetailsFragment2 extends DashboardFragment implements 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 {