From 508c7c16abe29cdc4d2a71b272f5008d3ebe5cc4 Mon Sep 17 00:00:00 2001 From: Jianzheng Zhou Date: Thu, 15 Aug 2013 14:34:52 +0800 Subject: [PATCH] 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 --- src/com/android/settings/TetherSettings.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java index d2c99dc9657..4775b174072 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);