Remove regulatory group setting in advanced wifi settingandroid-2.1_r2.1sandroid-2.1_r2.1p2android-2.1_r2.1pandroid-2.1_r2eclair-sholes-release2eclair-releaseeclair-passion-release

Bug: 2378844
Change-Id: I2eefa73cca238ab04842ffc8f8968dac5f953456

1 files changed, 18 insertions, 6 deletions

diff --git a/src/com/android/settings/wifi/AdvancedSettings.java b/src/com/android/settings/wifi/AdvancedSettings.java
index 5906e70c2c4..ff485deeabc 100644
--- a/src/com/android/settings/wifi/AdvancedSettings.java
+++ b/src/com/android/settings/wifi/AdvancedSettings.java
@@ -71,12 +71,20 @@ public class AdvancedSettings extends PreferenceActivity
             preference.setOnPreferenceChangeListener(this);
         }
 
-        /*
-         * Fix the Run-time IllegalStateException that ListPreference requires an entries
-         * array and an entryValues array, this exception occurs when user open/close the
-         * slider in the Regulatory domain dialog.
+//        /*
+//         * Fix the Run-time IllegalStateException that ListPreference requires an entries
+//         * array and an entryValues array, this exception occurs when user open/close the
+//         * slider in the Regulatory domain dialog.
+//         */
+//        initNumChannelsPreference();
+        /**
+         * Remove user control of regulatory domain
+         * channel count settings
          */
-        initNumChannelsPreference();
+        Preference chanPref = findPreference(KEY_NUM_CHANNELS);
+        if (chanPref != null) {
+            getPreferenceScreen().removePreference(chanPref);
+        }
     }
     
     @Override
@@ -84,7 +92,11 @@ public class AdvancedSettings extends PreferenceActivity
         super.onResume();
         
         updateUi();
-        initNumChannelsPreference();
+        /**
+         * Remove user control of regulatory domain
+         * channel count settings
+         */
+        //initNumChannelsPreference();
         initSleepPolicyPreference();
         refreshMacAddress();
     }