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

* commit 'a1fa7cef5d88d0f515efa07d0f7274c41fa6d712': Fix one NPE in tethering setting
2013-08-15 07:19:36 -07:00
parent c4cdd59e02 a1fa7cef5d
commit 9e96c453fb
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);