diff options
| author | Julia Reynolds <juliacr@google.com> | 2014-06-18 09:23:15 -0400 |
|---|---|---|
| committer | Julia Reynolds <juliacr@google.com> | 2014-07-23 21:06:21 +0000 |
| commit | 1a0297c544cb15ed4b56e70575b169b3889543b7 (patch) | |
| tree | a1f8b859245632ee0ac092c55028f8987b921aea /src/com/android/settings/wifi/WifiSettings.java | |
| parent | 289a63f509972372e37fc95de630a5410b4ebd5c (diff) | |
| download | packages_apps_Settings-1a0297c544cb15ed4b56e70575b169b3889543b7.zip packages_apps_Settings-1a0297c544cb15ed4b56e70575b169b3889543b7.tar.gz packages_apps_Settings-1a0297c544cb15ed4b56e70575b169b3889543b7.tar.bz2 | |
Use restrictionsprovider framework in Settings.
Bug: 15305103
Change-Id: Ib0147e366fe90de3512d0cc06e2a47ee16012dff
Diffstat (limited to 'src/com/android/settings/wifi/WifiSettings.java')
| -rw-r--r-- | src/com/android/settings/wifi/WifiSettings.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index ff34a69..ccf9fae 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -442,7 +442,7 @@ public class WifiSettings extends RestrictedSettingsFragment @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { // If the user is not allowed to configure wifi, do not show the menu. - if (isRestrictedAndNotPinProtected()) return; + if (isUiRestricted()) return; addOptionsMenuItems(menu); super.onCreateOptionsMenu(menu, inflater); @@ -491,7 +491,7 @@ public class WifiSettings extends RestrictedSettingsFragment @Override public boolean onOptionsItemSelected(MenuItem item) { // If the user is not allowed to configure wifi, do not handle menu selections. - if (isRestrictedAndNotPinProtected()) return false; + if (isUiRestricted()) return false; switch (item.getItemId()) { case MENU_ID_WPS_PBC: @@ -686,7 +686,7 @@ public class WifiSettings extends RestrictedSettingsFragment // Safeguard from some delayed event handling if (getActivity() == null) return; - if (isRestrictedAndNotPinProtected()) { + if (isUiRestricted()) { addMessagePreference(R.string.wifi_empty_list_user_restricted); return; } |