am 9e96c453: am a1fa7cef: am 1faefa06: Merge "Fix one NPE in tethering setting"

* commit '9e96c453fb84ec4832bde217617958121947128b': Fix one NPE in tethering setting
2013-08-15 07:21:07 -07:00
parent 741b2b94c3 9e96c453fb
commit 1a1bec1a97
1 changed files with 2 additions and 0 deletions
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -387,6 +387,8 @@ public class TetherSettings extends SettingsPreferenceFragment
        }

        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+        if (adapter == null)
+            return;
        int btState = adapter.getState();
        if (btState == BluetoothAdapter.STATE_TURNING_OFF) {
            mBluetoothTether.setEnabled(false);