Merge "Settings user restriction changes: wireless & networks changes."

2014-06-09 19:22:18 +00:00
parent 51d898fd02 ee27b9de8f
commit c92af83b0c
7 changed files with 135 additions and 10 deletions
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -467,6 +467,9 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
    public void onPause() {
        super.onPause();

+        if (mUnavailable) {
+            return;
+        }
        mSwitchBar.removeOnSwitchChangeListener(this);
        mSwitchBar.hide();
    }