Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Provider Model] 1.Only admin can config mobile data 2.Do not connect to mobile data when device is locked am: 0cf7dc970f

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15612686

Change-Id: I74190ee04dd615bc1423c9eaababac7b5237e1e9
This commit is contained in:
Zoey Chen
2021-08-26 11:14:05 +00:00
committed by Automerger Merge Worker
parent 435043892f 0cf7dc970f
commit 7e19420aa1
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java
View File

@@ -307,7 +307,8 @@ public class InternetDialog extends SystemUIDialog implements
private void setOnClickListener() { private void setOnClickListener() {
mMobileNetworkLayout.setOnClickListener(v -> { mMobileNetworkLayout.setOnClickListener(v -> {
if (mInternetDialogController.isMobileDataEnabled()) { if (mInternetDialogController.isMobileDataEnabled()
&& !mInternetDialogController.isDeviceLocked()) {
if (!mInternetDialogController.activeNetworkIsCellular()) { if (!mInternetDialogController.activeNetworkIsCellular()) {
mInternetDialogController.connectCarrierNetwork(); mInternetDialogController.connectCarrierNetwork();
} }

4
packages/SystemUI/src/com/android/systemui/statusbar/policy/AccessPointControllerImpl.java
View File

@@ -69,6 +69,7 @@ public class AccessPointControllerImpl
private final ArrayList<AccessPointCallback> mCallbacks = new ArrayList<AccessPointCallback>(); private final ArrayList<AccessPointCallback> mCallbacks = new ArrayList<AccessPointCallback>();
private final UserManager mUserManager; private final UserManager mUserManager;
private final UserTracker mUserTracker;
private final Executor mMainExecutor; private final Executor mMainExecutor;
private @Nullable WifiPickerTracker mWifiPickerTracker; private @Nullable WifiPickerTracker mWifiPickerTracker;
@@ -85,6 +86,7 @@ public class AccessPointControllerImpl
WifiPickerTrackerFactory wifiPickerTrackerFactory WifiPickerTrackerFactory wifiPickerTrackerFactory
) { ) {
mUserManager = userManager; mUserManager = userManager;
mUserTracker = userTracker;
mCurrentUser = userTracker.getUserId(); mCurrentUser = userTracker.getUserId();
mMainExecutor = mainExecutor; mMainExecutor = mainExecutor;
mWifiPickerTrackerFactory = wifiPickerTrackerFactory; mWifiPickerTrackerFactory = wifiPickerTrackerFactory;
@@ -121,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)); UserHandle.of(mCurrentUser)) || mUserTracker.getUserInfo().isAdmin();
} }
public void onUserSwitched(int newUserId) { public void onUserSwitched(int newUserId) {