summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/TetherSettings.java
diff options
context:
space:
mode:
authorJianzheng Zhou <jianzheng.zhou@freescale.com>2013-08-15 14:34:52 +0800
committerJianzheng Zhou <jianzheng.zhou@freescale.com>2013-08-15 14:34:52 +0800
commit508c7c16abe29cdc4d2a71b272f5008d3ebe5cc4 (patch)
treee8424b615961613b213e2c3c38f94f4280c8ec87 /src/com/android/settings/TetherSettings.java
parentba32c249addded770c288771748aa25d554352a0 (diff)
downloadpackages_apps_Settings-508c7c16abe29cdc4d2a71b272f5008d3ebe5cc4.zip
packages_apps_Settings-508c7c16abe29cdc4d2a71b272f5008d3ebe5cc4.tar.gz
packages_apps_Settings-508c7c16abe29cdc4d2a71b272f5008d3ebe5cc4.tar.bz2
Fix one NPE in tethering setting
Once we not declare BT feature, go Setting->more->tethering will trigger this NPE. Change-Id: I4736e7bade261475acda74e26250a81452018ffa Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
Diffstat (limited to 'src/com/android/settings/TetherSettings.java')
-rw-r--r--src/com/android/settings/TetherSettings.java2
1 files changed, 2 insertions, 0 deletions
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 @@ 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);