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 am: 28e4b34ec7

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

Change-Id: If3ea251bca59ab5f5d665416b2b069c0243e41f2
This commit is contained in:
Alex Johnston
2020-06-16 20:10:01 +00:00
committed by Automerger Merge Worker
parent 3385955653 28e4b34ec7
commit 6f9115072a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 {