summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/WirelessSettings.java
diff options
context:
space:
mode:
authorGeoffrey Borggaard <geoffreyb@google.com>2013-08-07 14:57:43 -0400
committerGeoffrey Borggaard <geoffreyb@google.com>2013-08-07 14:57:43 -0400
commit6e1102d9faf1b8f038857709412c291ef6140aa9 (patch)
tree5969c274c388cca35730010b4870ab060ad08305 /src/com/android/settings/WirelessSettings.java
parent8a181dd0d1e710a2376488b158d71db915f73be6 (diff)
downloadpackages_apps_Settings-6e1102d9faf1b8f038857709412c291ef6140aa9.zip
packages_apps_Settings-6e1102d9faf1b8f038857709412c291ef6140aa9.tar.gz
packages_apps_Settings-6e1102d9faf1b8f038857709412c291ef6140aa9.tar.bz2
Restriction pin changes.
Fixed bug in WirelessSettings where it was asking users for a PIN when they weren't restricted. Did this by refactoring the preference level pin checking into the superclass, where it checks for the restricted mode first. Also pin protected changes to certificates for restricted users. Change-Id: I8310fd39f0862159668318fc1360ec6859cc00d5
Diffstat (limited to 'src/com/android/settings/WirelessSettings.java')
-rw-r--r--src/com/android/settings/WirelessSettings.java14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index ecb984d..81c1794 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -16,7 +16,6 @@
package com.android.settings;
-import java.util.HashSet;
import android.app.Activity;
import android.app.AlertDialog;
@@ -75,7 +74,6 @@ public class WirelessSettings extends RestrictedSettingsFragment {
private static final int MANAGE_MOBILE_PLAN_DIALOG_ID = 1;
private static final String SAVED_MANAGE_MOBILE_PLAN_MSG = "mManageMobilePlanMessage";
- private final HashSet<Preference> mProtectedByRestictionsPrefs = new HashSet<Preference>();
public WirelessSettings() {
super(null);
@@ -87,9 +85,8 @@ public class WirelessSettings extends RestrictedSettingsFragment {
*/
@Override
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
- if (mProtectedByRestictionsPrefs.contains(preference) && !hasChallengeSucceeded()) {
- restrictionsPinCheck(RESTRICTIONS_PIN_SET);
- return false;
+ if (ensurePinRestrictedPreference(preference)) {
+ return true;
}
log("onPreferenceTreeClick: preference=" + preference);
if (preference == mAirplaneModePreference && Boolean.parseBoolean(
@@ -155,13 +152,6 @@ public class WirelessSettings extends RestrictedSettingsFragment {
}
}
- private void protectByRestrictions(String key) {
- Preference pref = findPreference(key);
- if (pref != null) {
- mProtectedByRestictionsPrefs.add(pref);
- }
- }
-
@Override
public Dialog onCreateDialog(int dialogId) {
log("onCreateDialog: dialogId=" + dialogId);