From fb37824e0632cfe574e7445438ed98630fe90482 Mon Sep 17 00:00:00 2001
From: Zoey Chen <zoeychen@google.com>
Date: Wed, 11 Aug 2021 11:37:01 +0800
Subject: [PATCH] [Provider Model] Fix the condition about admin user

Only the user is admin AND the admin is allowed to config mobile network

Bug: 196020201
Test: manual
Change-Id: I566dfa7585ade8fcba53a6a98213776e156267bd
Merged-In: I566dfa7585ade8fcba53a6a98213776e156267bd
(cherry picked from commit 0906d57bd0680d365f7dafa47f88985bae09e2f6)
---
 .../systemui/statusbar/policy/AccessPointControllerImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/AccessPointControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/AccessPointControllerImpl.java
index 2ab0e5903323f..6d6320e6962db 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/AccessPointControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/AccessPointControllerImpl.java
@@ -123,7 +123,7 @@ public class AccessPointControllerImpl
 
     public boolean canConfigMobileData() {
         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) {