Merge "Don't hide network reset even if it's disabled by admin." into oc-dev am: b50460086d

am: 5acb03575f

Change-Id: Ie8e346d71eaf4c3617753c83846cbd723582109e

src/com/android/settings/network/NetworkResetPreferenceController.java

@@ -31,7 +31,7 @@ public class NetworkResetPreferenceController extends PreferenceController {
 
     @Override
     public boolean isAvailable() {
-        return !mRestrictionChecker.hasRestriction();
+        return !mRestrictionChecker.hasUserRestriction();
     }
 
     @Override

src/com/android/settings/network/NetworkResetRestrictionChecker.java

@@ -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();
     }
 }