Merge changes I566dfa75,Id0d372cf,Ifb79e402,Ic80ed7f8,I40ff3ed0 into sc-qpr1-dev am: e454d516ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15611715 Change-Id: I454d2277fe07a0367928efeac48e9d1ae9d69f13
This commit is contained in:
@@ -123,7 +123,7 @@ public class AccessPointControllerImpl
|
|||||||
|
|
||||||
public boolean canConfigMobileData() {
|
public boolean canConfigMobileData() {
|
||||||
return !mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS,
|
return !mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS,
|
||||||
UserHandle.of(mCurrentUser)) || mUserTracker.getUserInfo().isAdmin();
|
UserHandle.of(mCurrentUser)) && mUserTracker.getUserInfo().isAdmin();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onUserSwitched(int newUserId) {
|
public void onUserSwitched(int newUserId) {
|
||||||
|
|||||||
Reference in New Issue
Block a user