Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added null pointer check

Browse Source
This commit is contained in:
zzy
2012-04-14 17:25:17 -07:00
committed by Matthew Xie
parent 4bb010a67f
commit 7f38f47ed2
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,12 +49,14 @@ import android.webkit.WebView;
import java.io.InputStream; import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Locale; import java.util.Locale;
import android.util.Log;
/* /*
* Displays preferences for Tethering. * Displays preferences for Tethering.
*/ */
public class TetherSettings extends SettingsPreferenceFragment public class TetherSettings extends SettingsPreferenceFragment
implements DialogInterface.OnClickListener, Preference.OnPreferenceChangeListener { implements DialogInterface.OnClickListener, Preference.OnPreferenceChangeListener {
private static final String TAG = "TetherSettings";
private static final boolean DBG = false;
private static final String USB_TETHER_SETTINGS = "usb_tether_settings"; private static final String USB_TETHER_SETTINGS = "usb_tether_settings";
private static final String ENABLE_WIFI_AP = "enable_wifi_ap"; private static final String ENABLE_WIFI_AP = "enable_wifi_ap";
@@ -234,8 +236,10 @@ public class TetherSettings extends SettingsPreferenceFragment
switch (intent switch (intent
.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR)) { .getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR)) {
case BluetoothAdapter.STATE_ON: case BluetoothAdapter.STATE_ON:
mBluetoothPan.setBluetoothTethering(true); if(mBluetoothPan != null) {
mBluetoothEnableForTether = false; mBluetoothPan.setBluetoothTethering(true);
mBluetoothEnableForTether = false;
}
break; break;
case BluetoothAdapter.STATE_OFF: case BluetoothAdapter.STATE_OFF:
@@ -392,7 +396,8 @@ public class TetherSettings extends SettingsPreferenceFragment
} else if (btState == BluetoothAdapter.STATE_TURNING_ON) { } else if (btState == BluetoothAdapter.STATE_TURNING_ON) {
mBluetoothTether.setEnabled(false); mBluetoothTether.setEnabled(false);
mBluetoothTether.setSummary(R.string.bluetooth_turning_on); mBluetoothTether.setSummary(R.string.bluetooth_turning_on);
} else if (btState == BluetoothAdapter.STATE_ON && mBluetoothPan.isTetheringOn()) { } else if (btState == BluetoothAdapter.STATE_ON &&
mBluetoothPan != null && mBluetoothPan.isTetheringOn()) {
mBluetoothTether.setChecked(true); mBluetoothTether.setChecked(true);
mBluetoothTether.setEnabled(true); mBluetoothTether.setEnabled(true);
if (bluetoothTethered > 1) { if (bluetoothTethered > 1) {