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

This commit is contained in:
Alex Johnston
2020-06-16 19:06:52 +00:00
committed by Android (Google) Code Review

View File

@@ -142,8 +142,10 @@ 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());
admin = new EnforcedAdmin(dpm.getProfileOwnerAsUser(profileOwnerUserId), if (profileOwnerUserId != UserHandle.USER_NULL) {
null, UserHandle.of(profileOwnerUserId)); admin = new EnforcedAdmin(dpm.getProfileOwnerAsUser(profileOwnerUserId),
null, UserHandle.of(profileOwnerUserId));
}
} }
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(), admin); RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(), admin);
} else { } else {