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

Commit 3771564a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Settings] User with restriction should avoid from having entries... 

Merge "[Settings] User with restriction should avoid from having entries through Settings search" into tm-qpr-dev am: 0362083f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21367719



Change-Id: I54ad21af66956d5711a72f587d9af4c8389a185f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f02d69dd 0362083f

src/com/android/settings/datausage/BillingCycleSettings.java

+3 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import androidx.preference.SwitchPreference; 
import com.android.settings.R;

import com.android.settings.core.instrumentation.InstrumentedDialogFragment;

import com.android.settings.network.SubscriptionUtil;

import com.android.settings.network.telephony.MobileNetworkUtils;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settingslib.NetworkPolicyEditor;

import com.android.settingslib.net.DataUsageController;
@@ -517,7 +518,8 @@ public class BillingCycleSettings extends DataUsageBaseFragment implements 


                @Override

                protected boolean isPageSearchEnabled(Context context) {

                    return SubscriptionUtil.isSimHardwareVisible(context)

                    return (!MobileNetworkUtils.isMobileNetworkUserRestricted(context))

                            && SubscriptionUtil.isSimHardwareVisible(context)

                            && DataUsageUtils.hasMobileData(context);

                }

            };

src/com/android/settings/network/telephony/MobileNetworkUtils.java

+18 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import android.os.Bundle; 
import android.os.PersistableBundle;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.UserManager;

import android.provider.Settings;

import android.telecom.PhoneAccountHandle;

import android.telecom.TelecomManager;
@@ -113,6 +114,23 @@ public class MobileNetworkUtils { 
    public static final int NO_CELL_DATA_TYPE_ICON = 0;

    public static final Drawable EMPTY_DRAWABLE = new ColorDrawable(Color.TRANSPARENT);



    /**

     * Return true if current user limited by UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS.

     *

     * Note: Guest user should have this restriction through

     *       GuestTelephonyPreferenceController.java.

     *       However, it's not help with those devices upgraded their software.

     */

    public static boolean isMobileNetworkUserRestricted(Context context) {

        UserManager um = context.getSystemService(UserManager.class);

        boolean disallow = false;

        if (um != null) {

            disallow = um.isGuestUser() || um.hasUserRestriction(

                    UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS);

        }

        return disallow;

    }



    /**

     * Returns if DPC APNs are enforced.

     */