Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 1d4488c8: Merge "Cache bluetooth connection state from callback" into mnc-dev

Browse Source 
* commit '1d4488c825aa147e2c7224c026df7cf54563f395':
  Cache bluetooth connection state from callback
This commit is contained in:
Jason Monk
2015-05-28 14:34:31 +00:00
committed by Android Git Automerger
parent 320a702c99 1d4488c825
commit 1acdabef49
3 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
View File

@@ -149,9 +149,10 @@ public class BluetoothTile extends QSTile<QSTile.BooleanState> {
private final BluetoothController.Callback mCallback = new BluetoothController.Callback() {
@Override
public void onBluetoothStateChange(boolean enabled, boolean connecting) {
public void onBluetoothStateChange(boolean enabled) {
refreshState();
}
@Override
public void onBluetoothDevicesChanged() {
mUiHandler.post(new Runnable() {

2
packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothController.java
View File

@@ -35,7 +35,7 @@ public interface BluetoothController {
void disconnect(CachedBluetoothDevice device);
public interface Callback {
void onBluetoothStateChange(boolean enabled, boolean connecting);
void onBluetoothStateChange(boolean enabled);
void onBluetoothDevicesChanged();
}
}

29
packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java
View File

@@ -41,7 +41,7 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa
private final LocalBluetoothManager mLocalBluetoothManager;
private boolean mEnabled;
private boolean mConnecting;
private int mConnectionState = BluetoothAdapter.STATE_DISCONNECTED;
private CachedBluetoothDevice mLastDevice;
private final H mHandler = new H();
@@ -63,7 +63,7 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa
return;
}
pw.print(" mEnabled="); pw.println(mEnabled);
pw.print(" mConnecting="); pw.println(mConnecting);
pw.print(" mConnectionState="); pw.println(stateToString(mConnectionState));
pw.print(" mLastDevice="); pw.println(mLastDevice);
pw.print(" mCallbacks.size="); pw.println(mCallbacks.size());
pw.println(" Bluetooth Devices:");
@@ -73,10 +73,25 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa
}
}
private static String stateToString(int state) {
switch (state) {
case BluetoothAdapter.STATE_CONNECTED:
return "CONNECTED";
case BluetoothAdapter.STATE_CONNECTING:
return "CONNECTING";
case BluetoothAdapter.STATE_DISCONNECTED:
return "DISCONNECTED";
case BluetoothAdapter.STATE_DISCONNECTING:
return "DISCONNECTING";
}
return "UNKNOWN(" + state + ")";
}
private String getDeviceString(CachedBluetoothDevice device) {
return device.getName() + " " + device.getBondState() + " " + device.isConnected();
}
@Override
public void addStateChangedCallback(Callback cb) {
mCallbacks.add(cb);
mHandler.sendEmptyMessage(H.MSG_STATE_CHANGED);
@@ -94,14 +109,12 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa
@Override
public boolean isBluetoothConnected() {
return mLocalBluetoothManager != null
&& mLocalBluetoothManager.getBluetoothAdapter().getConnectionState()
== BluetoothAdapter.STATE_CONNECTED;
return mConnectionState == BluetoothAdapter.STATE_CONNECTED;
}
@Override
public boolean isBluetoothConnecting() {
return mConnecting;
return mConnectionState == BluetoothAdapter.STATE_CONNECTING;
}
@Override
@@ -190,7 +203,7 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa
@Override
public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) {
mConnecting = state == BluetoothAdapter.STATE_CONNECTING;
mConnectionState = state;
mLastDevice = cachedDevice;
updateConnected();
mHandler.sendEmptyMessage(H.MSG_STATE_CHANGED);
@@ -225,7 +238,7 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa
}
private void fireStateChange(BluetoothController.Callback cb) {
cb.onBluetoothStateChange(mEnabled, mConnecting);
cb.onBluetoothStateChange(mEnabled);
}
}
}