commit 1faefa06a3a742123af8ea5be5bbfb730db16c7c
author Robert Greenwalt <rgreenwalt@google.com> Thu Aug 15 14:13:09 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 15 14:13:10 2013 +0000
tree 84bf5952623d6f695e2c42e32e1f75d5bd5ddb9a
parent 8f00b7711c48a102a70f9b7e6a563aa14b79f5a5
parent 508c7c16abe29cdc4d2a71b272f5008d3ebe5cc4

Merge "Fix one NPE in tethering setting"

src/com/android/settings/TetherSettings.java

diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index d2c99dc..4775b17 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -385,6 +385,8 @@
         }
 
         BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+        if (adapter == null)
+            return;
         int btState = adapter.getState();
         if (btState == BluetoothAdapter.STATE_TURNING_OFF) {
             mBluetoothTether.setEnabled(false);