Merge "Don't hide network reset even if it's disabled by admin." into oc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
b50460086d
@@ -31,7 +31,7 @@ public class NetworkResetPreferenceController extends PreferenceController {
|
||||
|
||||
@Override
|
||||
public boolean isAvailable() {
|
||||
return !mRestrictionChecker.hasRestriction();
|
||||
return !mRestrictionChecker.hasUserRestriction();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -45,9 +45,13 @@ public class NetworkResetRestrictionChecker {
|
||||
mContext, UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId()) != null;
|
||||
}
|
||||
|
||||
boolean hasRestriction() {
|
||||
boolean hasUserRestriction() {
|
||||
return !mUserManager.isAdminUser()
|
||||
|| hasUserBaseRestriction()
|
||||
|| hasUserBaseRestriction();
|
||||
}
|
||||
|
||||
boolean hasRestriction() {
|
||||
return hasUserRestriction()
|
||||
|| isRestrictionEnforcedByAdmin();
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user