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

* commit '1faefa06a3a742123af8ea5be5bbfb730db16c7c': Fix one NPE in tethering setting
2013-08-15 07:17:11 -07:00
parent b4d720f9d7 1faefa06a3
commit a1fa7cef5d
1 changed files with 2 additions and 0 deletions
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -385,6 +385,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);