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

Merge "Allow channel count modification on userdebug"

Browse Source
This commit is contained in:
Irfan Sheriff
2010-01-28 20:45:57 -08:00
committed by Android (Google) Code Review
parent adeafd3281 0a57284e15
commit 454b7a4a04
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/com/android/settings/wifi/AdvancedSettings.java
View File

@@ -34,6 +34,7 @@ import android.view.KeyEvent;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.widget.Toast; import android.widget.Toast;
import android.os.SystemProperties;
public class AdvancedSettings extends PreferenceActivity public class AdvancedSettings extends PreferenceActivity
implements Preference.OnPreferenceChangeListener { implements Preference.OnPreferenceChangeListener {
@@ -57,6 +58,9 @@ public class AdvancedSettings extends PreferenceActivity
private static final int MENU_ITEM_SAVE = Menu.FIRST; private static final int MENU_ITEM_SAVE = Menu.FIRST;
private static final int MENU_ITEM_CANCEL = Menu.FIRST + 1; private static final int MENU_ITEM_CANCEL = Menu.FIRST + 1;
//Tracks ro.debuggable (1 on userdebug builds)
private static int DEBUGGABLE;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@@ -71,19 +75,24 @@ public class AdvancedSettings extends PreferenceActivity
preference.setOnPreferenceChangeListener(this); preference.setOnPreferenceChangeListener(this);
} }
// /* DEBUGGABLE = SystemProperties.getInt("ro.debuggable", 0);
// * 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 * Remove user control of regulatory domain
* channel count settings * channel count settings in non userdebug builds
*/ */
Preference chanPref = findPreference(KEY_NUM_CHANNELS); if (DEBUGGABLE == 1) {
if (chanPref != null) { /*
getPreferenceScreen().removePreference(chanPref); * 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();
} else {
Preference chanPref = findPreference(KEY_NUM_CHANNELS);
if (chanPref != null) {
getPreferenceScreen().removePreference(chanPref);
}
} }
} }
@@ -94,9 +103,11 @@ public class AdvancedSettings extends PreferenceActivity
updateUi(); updateUi();
/** /**
* Remove user control of regulatory domain * Remove user control of regulatory domain
* channel count settings * channel count settings in non userdebug builds
*/ */
//initNumChannelsPreference(); if (DEBUGGABLE == 1) {
initNumChannelsPreference();
}
initSleepPolicyPreference(); initSleepPolicyPreference();
refreshMacAddress(); refreshMacAddress();
} }