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

Commit bc9a3630 authored by Nicolas Prevot's avatar Nicolas Prevot Committed by Android (Google) Code Review
Browse files

Merge "Don't allow secondary users apps to start restricted Settings fragment." into mnc-dev

parents e6d7623c a5df4779

src/com/android/settings/ApnSettings.java

+3 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.os.Handler; 
import android.os.HandlerThread;

import android.os.Looper;

import android.os.Message;

import android.os.UserHandle;

import android.os.UserManager;

import android.preference.Preference;

import android.preference.PreferenceGroup;
@@ -173,7 +174,8 @@ public class ApnSettings extends SettingsPreferenceFragment implements 
            getListView().setEmptyView(empty);

        }



        if (mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)) {

        if (mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)

                || UserHandle.myUserId()!= UserHandle.USER_OWNER) {

            mUnavailable = true;

            setPreferenceScreen(new PreferenceScreen(getActivity(), null));

            return;

src/com/android/settings/TetherSettings.java

+3 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import android.net.wifi.WifiConfiguration; 
import android.net.wifi.WifiManager;

import android.os.Bundle;

import android.os.Environment;

import android.os.UserHandle;

import android.os.UserManager;

import android.preference.Preference;

import android.preference.PreferenceScreen;
@@ -123,7 +124,8 @@ public class TetherSettings extends SettingsPreferenceFragment 


        mUm = (UserManager) getSystemService(Context.USER_SERVICE);



        if (mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_TETHERING)) {

        if (mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_TETHERING)

                || UserHandle.myUserId() != UserHandle.USER_OWNER) {

            mUnavailable = true;

            setPreferenceScreen(new PreferenceScreen(getActivity(), null));

            return;

src/com/android/settings/vpn2/VpnSettings.java

+2 −1
Original line number Diff line number Diff line
@@ -106,7 +106,8 @@ public class VpnSettings extends SettingsPreferenceFragment implements 
        super.onCreate(savedState);



        mUserManager = (UserManager) getSystemService(Context.USER_SERVICE);

        if (mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_VPN)) {

        if (mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_VPN)

                || UserHandle.myUserId() != UserHandle.USER_OWNER) {

            mUnavailable = true;

            setPreferenceScreen(new PreferenceScreen(getActivity(), null));

            return;