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

Fix for crash in TetherSettings when monkey is running.

Browse Source 
Bug: 3407666

onCreateView can get called on returning from another fragment. Moved the
relevant code to onCreate().

Change-Id: Icf08c18a3981051cce4eca2d07334d0a9f3c0116
This commit is contained in:
Amith Yamasani
2011-02-14 14:19:08 -08:00
parent f11033f7ab
commit e419bc1bed
1 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/com/android/settings/TetherSettings.java
View File

@@ -86,12 +86,6 @@ public class TetherSettings extends SettingsPreferenceFragment {
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
super.onCreate(icicle); super.onCreate(icicle);
addPreferencesFromResource(R.xml.tether_prefs); addPreferencesFromResource(R.xml.tether_prefs);
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
View view = super.onCreateView(inflater, container, savedInstanceState);
final Activity activity = getActivity(); final Activity activity = getActivity();
mBluetoothPan = new BluetoothPan(activity); mBluetoothPan = new BluetoothPan(activity);
@@ -109,17 +103,19 @@ public class TetherSettings extends SettingsPreferenceFragment {
mWifiRegexs = cm.getTetherableWifiRegexs(); mWifiRegexs = cm.getTetherableWifiRegexs();
mBluetoothRegexs = cm.getTetherableBluetoothRegexs(); mBluetoothRegexs = cm.getTetherableBluetoothRegexs();
boolean usbAvailable = mUsbRegexs.length != 0; final boolean usbAvailable = mUsbRegexs.length != 0;
boolean wifiAvailable = mWifiRegexs.length != 0; final boolean wifiAvailable = mWifiRegexs.length != 0;
boolean bluetoothAvailable = mBluetoothRegexs.length != 0; final boolean bluetoothAvailable = mBluetoothRegexs.length != 0;
if (!usbAvailable || Utils.isMonkeyRunning()) { if (!usbAvailable || Utils.isMonkeyRunning()) {
getPreferenceScreen().removePreference(mUsbTether); getPreferenceScreen().removePreference(mUsbTether);
} }
if (!wifiAvailable) { if (!wifiAvailable) {
getPreferenceScreen().removePreference(mEnableWifiAp); getPreferenceScreen().removePreference(mEnableWifiAp);
getPreferenceScreen().removePreference(mWifiApSettings); getPreferenceScreen().removePreference(mWifiApSettings);
} }
if (!bluetoothAvailable) { if (!bluetoothAvailable) {
getPreferenceScreen().removePreference(mBluetoothTether); getPreferenceScreen().removePreference(mBluetoothTether);
} else { } else {
@@ -129,27 +125,9 @@ public class TetherSettings extends SettingsPreferenceFragment {
mBluetoothTether.setChecked(false); mBluetoothTether.setChecked(false);
} }
} }
/* Don't change the title for two-pane settings
if (wifiAvailable && usbAvailable && bluetoothAvailable){
activity.setTitle(R.string.tether_settings_title_all);
} else if (wifiAvailable && usbAvailable){
activity.setTitle(R.string.tether_settings_title_all);
} else if (wifiAvailable && bluetoothAvailable){
activity.setTitle(R.string.tether_settings_title_all);
} else if (wifiAvailable) {
activity.setTitle(R.string.tether_settings_title_wifi);
} else if (usbAvailable && bluetoothAvailable) {
activity.setTitle(R.string.tether_settings_title_usb_bluetooth);
} else if (usbAvailable) {
activity.setTitle(R.string.tether_settings_title_usb);
} else {
activity.setTitle(R.string.tether_settings_title_bluetooth);
}
*/
mWifiApEnabler = new WifiApEnabler(activity, mEnableWifiAp); mWifiApEnabler = new WifiApEnabler(activity, mEnableWifiAp);
mView = new WebView(activity); mView = new WebView(activity);
return view;
} }
@Override @Override