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

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

Browse Source 
am: 023f7033ef

* commit '023f7033ef114c8f3e57d0178ae2583289f5709a':
  settings: Fix more NPEs when bluetooth is missing.
This commit is contained in:
Prathmesh Prabhu
2016-03-15 21:00:33 +00:00
committed by android-build-merger
parent 6bfdd3a973 023f7033ef
commit fe87ed9d40
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/ResetNetworkConfirm.java
View File

@@ -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 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
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);

3
src/com/android/settings/widget/SettingsAppWidgetProvider.java
View File

@@ -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());
}