Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f911507 authored by Alex Johnston's avatar Alex Johnston Committed by Automerger Merge Worker
Browse files

Merge "Wifi details - handle no profile owner" into rvc-dev am: dd1d9c4d am:... 

Merge "Wifi details - handle no profile owner" into rvc-dev am: dd1d9c4d am: ec64a1d5 am: 28e4b34e

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

Change-Id: If3ea251bca59ab5f5d665416b2b069c0243e41f2
parents 33859556 28e4b34e

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

+4 −2
Original line number Diff line number Diff line
@@ -142,9 +142,11 @@ public class WifiNetworkDetailsFragment2 extends DashboardFragment implements 
                                getContext().getSystemService(Context.USER_SERVICE);

                        final int profileOwnerUserId = Utils.getManagedProfileId(

                                um, UserHandle.myUserId());

                        if (profileOwnerUserId != UserHandle.USER_NULL) {

                            admin = new EnforcedAdmin(dpm.getProfileOwnerAsUser(profileOwnerUserId),

                                    null, UserHandle.of(profileOwnerUserId));

                        }

                    }

                    RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(), admin);

                } else {

                    showDialog(WIFI_DIALOG_ID);