settings: Fix more NPEs when bluetooth is missing.

Fix a couple NPEs in the settings app when device doesn't support bluetooth. BUG:27600761 Change-Id: I356f5e7f321e8230f85ec74da9e405449431846b
2016-03-11 13:27:17 -08:00
parent dccc582d26
commit 8d763c0302
2 changed files with 8 additions and 1 deletions
--- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java
+++ b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
@@ -454,6 +454,9 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
                    return STATE_UNKNOWN;  // On emulator?
                }
                sLocalBluetoothAdapter = manager.getBluetoothAdapter();
+                if (sLocalBluetoothAdapter == null) {
+                    return STATE_UNKNOWN;  // On emulator?
+                }
            }
            return bluetoothStateToFiveState(sLocalBluetoothAdapter.getBluetoothState());
        }