commit 023f7033ef114c8f3e57d0178ae2583289f5709a
author Prathmesh Prabhu <pprabhu@google.com> Tue Mar 15 20:54:44 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 15 20:54:44 2016 +0000
tree db27cfd5aaa91dfb0a37833a0595ce6ae3ec797d
parent 82c512dbd6072d21d00677a96cd015d20d1a952d
parent 8d763c03028419884ced41c7b630ce9a5c45437d

Merge "settings: Fix more NPEs when bluetooth is missing." into nyc-dev

src/com/android/settings/ResetNetworkConfirm.java

diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index 777f4d4..110398f 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -16,6 +16,7 @@
 
 package com.android.settings;
 
+import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothManager;
 import android.content.Context;
 import android.net.ConnectivityManager;
@@ -96,7 +97,10 @@
             BluetoothManager btManager = (BluetoothManager)
                     context.getSystemService(Context.BLUETOOTH_SERVICE);
             if (btManager != null) {
-                btManager.getAdapter().factoryReset();
+                BluetoothAdapter btAdapter = btManager.getAdapter();
+                if (btAdapter != null) {
+                    btAdapter.factoryReset();
+                }
             }
 
             ImsManager.factoryReset(context);

src/com/android/settings/widget/SettingsAppWidgetProvider.java

diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
index d7cbaae..38fed94 100644
--- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java
+++ b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
@@ -454,6 +454,9 @@
                     return STATE_UNKNOWN;  // On emulator?
                 }
                 sLocalBluetoothAdapter = manager.getBluetoothAdapter();
+                if (sLocalBluetoothAdapter == null) {
+                    return STATE_UNKNOWN;  // On emulator?
+                }
             }
             return bluetoothStateToFiveState(sLocalBluetoothAdapter.getBluetoothState());
         }