Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cf7dc97 authored by Zoey Chen's avatar Zoey Chen
Browse files

[Provider Model] 1.Only admin can config mobile data 2.Do not connect to... 

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

Bug: 195901667
Bug: 196020201
Test: manual
Change-Id: Id0d372cfe4e71f323ae3f3136acfb9857ad1c539
Merged-In: Id0d372cfe4e71f323ae3f3136acfb9857ad1c539
(cherry picked from commit c5c72dc4)
parent b17c58a7

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

+2 −1
Original line number Diff line number Diff line
@@ -307,7 +307,8 @@ public class InternetDialog extends SystemUIDialog implements 


    private void setOnClickListener() {

        mMobileNetworkLayout.setOnClickListener(v -> {

            if (mInternetDialogController.isMobileDataEnabled()) {

            if (mInternetDialogController.isMobileDataEnabled()

                    && !mInternetDialogController.isDeviceLocked()) {

                if (!mInternetDialogController.activeNetworkIsCellular()) {

                    mInternetDialogController.connectCarrierNetwork();

                }

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

+3 −1
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ public class AccessPointControllerImpl 


    private final ArrayList<AccessPointCallback> mCallbacks = new ArrayList<AccessPointCallback>();

    private final UserManager mUserManager;

    private final UserTracker mUserTracker;

    private final Executor mMainExecutor;



    private @Nullable WifiPickerTracker mWifiPickerTracker;
@@ -85,6 +86,7 @@ public class AccessPointControllerImpl 
            WifiPickerTrackerFactory wifiPickerTrackerFactory

    ) {

        mUserManager = userManager;

        mUserTracker = userTracker;

        mCurrentUser = userTracker.getUserId();

        mMainExecutor = mainExecutor;

        mWifiPickerTrackerFactory = wifiPickerTrackerFactory;
@@ -121,7 +123,7 @@ public class AccessPointControllerImpl 


    public boolean canConfigMobileData() {

        return !mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS,

                UserHandle.of(mCurrentUser));

                UserHandle.of(mCurrentUser)) || mUserTracker.getUserInfo().isAdmin();

    }



    public void onUserSwitched(int newUserId) {