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
This commit is contained in:
@@ -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);
|
||||
|
Reference in New Issue
Block a user