PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nicolas Prevot
2015-06-03 17:28:34 +00:00
committed by Android (Google) Code Review
parent e6d7623ca7 a5df4779a0
commit bc9a3630bc
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/ApnSettings.java
View File

@@ -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;

4
src/com/android/settings/TetherSettings.java
View File

@@ -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;

3
src/com/android/settings/vpn2/VpnSettings.java
View File

@@ -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;