summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/WirelessSettings.java
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2014-11-12 13:46:43 -0800
committerAmith Yamasani <yamasani@google.com>2014-11-12 15:35:17 -0800
commit32505ac6992207367bf9a0fb05e8928602c9391b (patch)
tree1929031e8a95e837d84854fbe12bf82088b2095a /src/com/android/settings/WirelessSettings.java
parent64cb79bb6982ebe2907daed761d829dea4fef081 (diff)
downloadpackages_apps_Settings-32505ac6992207367bf9a0fb05e8928602c9391b.zip
packages_apps_Settings-32505ac6992207367bf9a0fb05e8928602c9391b.tar.gz
packages_apps_Settings-32505ac6992207367bf9a0fb05e8928602c9391b.tar.bz2
Don't show SMS app settings for restricted profiles
Restricted profiles might not have an SMS app and there is currently no UI to enable/disable SMS for restricted profiles. SMS is disabled by default in this case. So hide the SMS app picker option in restricted profiles. Bug: 17521457 Change-Id: Id2bb3e4690a4afba75ebcec8531727ec150c5632
Diffstat (limited to 'src/com/android/settings/WirelessSettings.java')
-rw-r--r--src/com/android/settings/WirelessSettings.java29
1 files changed, 20 insertions, 9 deletions
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 4f92cf6..e9c39d9 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -260,7 +260,9 @@ public class WirelessSettings extends SettingsPreferenceFragment
addPreferencesFromResource(R.xml.wireless_settings);
- final boolean isSecondaryUser = UserHandle.myUserId() != UserHandle.USER_OWNER;
+ final int myUserId = UserHandle.myUserId();
+ final boolean isSecondaryUser = myUserId != UserHandle.USER_OWNER;
+ final boolean isRestrictedUser = mUm.getUserInfo(myUserId).isRestricted();
final Activity activity = getActivity();
mAirplaneModePreference = (SwitchPreference) findPreference(KEY_TOGGLE_AIRPLANE);
@@ -272,8 +274,13 @@ public class WirelessSettings extends SettingsPreferenceFragment
mNfcEnabler = new NfcEnabler(activity, nfc, androidBeam);
mSmsApplicationPreference = (AppListPreference) findPreference(KEY_SMS_APPLICATION);
- mSmsApplicationPreference.setOnPreferenceChangeListener(this);
- initSmsApplicationSetting();
+ // Restricted users cannot currently read/write SMS.
+ if (isRestrictedUser) {
+ removePreference(KEY_SMS_APPLICATION);
+ } else {
+ mSmsApplicationPreference.setOnPreferenceChangeListener(this);
+ initSmsApplicationSetting();
+ }
// Remove NSD checkbox by default
getPreferenceScreen().removePreference(nsd);
@@ -485,8 +492,11 @@ public class WirelessSettings extends SettingsPreferenceFragment
result.add(KEY_TOGGLE_NSD);
final UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
- final boolean isSecondaryUser = UserHandle.myUserId() != UserHandle.USER_OWNER;
- final boolean isWimaxEnabled = !isSecondaryUser && context.getResources().getBoolean(
+ final int myUserId = UserHandle.myUserId();
+ final boolean isSecondaryUser = myUserId != UserHandle.USER_OWNER;
+ final boolean isRestrictedUser = um.getUserInfo(myUserId).isRestricted();
+ final boolean isWimaxEnabled = !isSecondaryUser
+ && context.getResources().getBoolean(
com.android.internal.R.bool.config_wimaxEnabled);
if (!isWimaxEnabled
|| um.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)) {
@@ -498,7 +508,8 @@ public class WirelessSettings extends SettingsPreferenceFragment
}
// Remove NFC if not available
- final NfcManager manager = (NfcManager) context.getSystemService(Context.NFC_SERVICE);
+ final NfcManager manager = (NfcManager)
+ context.getSystemService(Context.NFC_SERVICE);
if (manager != null) {
NfcAdapter adapter = manager.getDefaultAdapter();
if (adapter == null) {
@@ -524,7 +535,7 @@ public class WirelessSettings extends SettingsPreferenceFragment
// Remove SMS Application if the device does not support SMS
TelephonyManager tm =
(TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
- if (!tm.isSmsCapable()) {
+ if (!tm.isSmsCapable() || isRestrictedUser) {
result.add(KEY_SMS_APPLICATION);
}
@@ -539,8 +550,8 @@ public class WirelessSettings extends SettingsPreferenceFragment
result.add(KEY_PROXY_SETTINGS);
// Disable Tethering if it's not allowed or if it's a wifi-only device
- ConnectivityManager cm =
- (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+ ConnectivityManager cm = (ConnectivityManager)
+ context.getSystemService(Context.CONNECTIVITY_SERVICE);
if (isSecondaryUser || !cm.isTetheringSupported()) {
result.add(KEY_TETHER_SETTINGS);
}