PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '1faefa06a3a742123af8ea5be5bbfb730db16c7c':
  Fix one NPE in tethering setting
This commit is contained in:
Robert Greenwalt
2013-08-15 07:17:11 -07:00
committed by Android Git Automerger
parent b4d720f9d7 1faefa06a3
commit a1fa7cef5d
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/TetherSettings.java
View File

@@ -385,6 +385,8 @@ public class TetherSettings extends SettingsPreferenceFragment
} }
BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
if (adapter == null)
return;
int btState = adapter.getState(); int btState = adapter.getState();
if (btState == BluetoothAdapter.STATE_TURNING_OFF) { if (btState == BluetoothAdapter.STATE_TURNING_OFF) {
mBluetoothTether.setEnabled(false); mBluetoothTether.setEnabled(false);