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

Block WiMax settings with UserRestriction.

Browse Source 
Change-Id: I6f254f65ed9e967a7ef13d599ab9ed525ce4b7f0
This commit is contained in:
Julia Reynolds
2014-06-24 15:22:50 -04:00
parent 8b44132467
commit 00d19c7426
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/WirelessSettings.java
View File

@@ -58,7 +58,7 @@ import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
public class WirelessSettings extends RestrictedSettingsFragment public class WirelessSettings extends SettingsPreferenceFragment
implements OnPreferenceChangeListener, Indexable { implements OnPreferenceChangeListener, Indexable {
private static final String TAG = "WirelessSettings"; private static final String TAG = "WirelessSettings";
@@ -94,9 +94,6 @@ public class WirelessSettings extends RestrictedSettingsFragment
private AppListPreference mSmsApplicationPreference; private AppListPreference mSmsApplicationPreference;
public WirelessSettings() {
super(null);
}
/** /**
* Invoked on each preference click in this hierarchy, overrides * Invoked on each preference click in this hierarchy, overrides
* PreferenceFragment's implementation. Used to make sure we track the * PreferenceFragment's implementation. Used to make sure we track the
@@ -104,9 +101,6 @@ public class WirelessSettings extends RestrictedSettingsFragment
*/ */
@Override @Override
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) { public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
if (ensurePinRestrictedPreference(preference)) {
return true;
}
log("onPreferenceTreeClick: preference=" + preference); log("onPreferenceTreeClick: preference=" + preference);
if (preference == mAirplaneModePreference && Boolean.parseBoolean( if (preference == mAirplaneModePreference && Boolean.parseBoolean(
SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE))) { SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE))) {
@@ -282,7 +276,8 @@ public class WirelessSettings extends RestrictedSettingsFragment
//enable/disable wimax depending on the value in config.xml //enable/disable wimax depending on the value in config.xml
final boolean isWimaxEnabled = !isSecondaryUser && this.getResources().getBoolean( final boolean isWimaxEnabled = !isSecondaryUser && this.getResources().getBoolean(
com.android.internal.R.bool.config_wimaxEnabled); com.android.internal.R.bool.config_wimaxEnabled);
if (!isWimaxEnabled) { if (!isWimaxEnabled
|| mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)) {
PreferenceScreen root = getPreferenceScreen(); PreferenceScreen root = getPreferenceScreen();
Preference ps = (Preference) findPreference(KEY_WIMAX_SETTINGS); Preference ps = (Preference) findPreference(KEY_WIMAX_SETTINGS);
if (ps != null) root.removePreference(ps); if (ps != null) root.removePreference(ps);
@@ -293,7 +288,6 @@ public class WirelessSettings extends RestrictedSettingsFragment
ps.setDependency(KEY_TOGGLE_AIRPLANE); ps.setDependency(KEY_TOGGLE_AIRPLANE);
} }
} }
protectByRestrictions(KEY_WIMAX_SETTINGS);
// Manually set dependencies for Wifi when not toggleable. // Manually set dependencies for Wifi when not toggleable.
if (toggleable == null || !toggleable.contains(Settings.Global.RADIO_WIFI)) { if (toggleable == null || !toggleable.contains(Settings.Global.RADIO_WIFI)) {
@@ -477,10 +471,12 @@ public class WirelessSettings extends RestrictedSettingsFragment
result.add(KEY_TOGGLE_NSD); result.add(KEY_TOGGLE_NSD);
final UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
final boolean isSecondaryUser = UserHandle.myUserId() != UserHandle.USER_OWNER; final boolean isSecondaryUser = UserHandle.myUserId() != UserHandle.USER_OWNER;
final boolean isWimaxEnabled = !isSecondaryUser && context.getResources().getBoolean( final boolean isWimaxEnabled = !isSecondaryUser && context.getResources().getBoolean(
com.android.internal.R.bool.config_wimaxEnabled); com.android.internal.R.bool.config_wimaxEnabled);
if (!isWimaxEnabled) { if (!isWimaxEnabled
|| um.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)) {
result.add(KEY_WIMAX_SETTINGS); result.add(KEY_WIMAX_SETTINGS);
} }