Merge "Fixed a Bluetooth discovery bug." into lmp-dev

This commit is contained in:
PauloftheWest
2014-09-19 23:45:24 +00:00
committed by Android (Google) Code Review

View File

@@ -98,10 +98,17 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
private final BroadcastReceiver mReceiver = new BroadcastReceiver() { private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
String action = intent.getAction(); final String action = intent.getAction();
final int state =
intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR);
if (action.equals(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED)) { if (action.equals(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED)) {
updateDeviceName(context); updateDeviceName(context);
} }
if (state == BluetoothAdapter.STATE_ON) {
mInitiateDiscoverable = true;
}
} }
private void updateDeviceName(Context context) { private void updateDeviceName(Context context) {