PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Wifi details - handle no profile owner" into rvc-dev am: dd1d9c4db0 am: ec64a1d562

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11866803

Change-Id: I67cf0cf480b4baede6e47b8d7958d842282d8714
This commit is contained in:
Alex Johnston
2020-06-16 19:47:02 +00:00
committed by Automerger Merge Worker
parent f1363f7809 ec64a1d562
commit 28e4b34ec7
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java
View File

@@ -142,9 +142,11 @@ public class WifiNetworkDetailsFragment2 extends DashboardFragment implements
getContext().getSystemService(Context.USER_SERVICE); getContext().getSystemService(Context.USER_SERVICE);
final int profileOwnerUserId = Utils.getManagedProfileId( final int profileOwnerUserId = Utils.getManagedProfileId(
um, UserHandle.myUserId()); um, UserHandle.myUserId());
if (profileOwnerUserId != UserHandle.USER_NULL) {
admin = new EnforcedAdmin(dpm.getProfileOwnerAsUser(profileOwnerUserId), admin = new EnforcedAdmin(dpm.getProfileOwnerAsUser(profileOwnerUserId),
null, UserHandle.of(profileOwnerUserId)); null, UserHandle.of(profileOwnerUserId));
} }
}
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(), admin); RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(), admin);
} else { } else {
showDialog(WIFI_DIALOG_ID); showDialog(WIFI_DIALOG_ID);