Merge "Clear profile connnection status of bonded devices when BT is turned off" into jb-mr1-dev (952146ee) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/bluetooth/CachedBluetoothDevice.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -119,6 +119,11 @@ final class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> {
		Log.d(TAG, "onProfileStateChanged: profile " + profile +
		" newProfileState " + newProfileState);
		}
		if (mLocalAdapter.getBluetoothState() == BluetoothAdapter.STATE_TURNING_OFF)
		{
		if (Utils.D) Log.d(TAG, " BT Turninig Off...Profile conn state change ignored...");
		return;
		}
		mProfileConnectionState.put(profile, newProfileState);
		if (newProfileState == BluetoothProfile.STATE_CONNECTED) {
		if (!mProfiles.contains(profile)) {
		@@ -328,6 +333,16 @@ final class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> {
		return mProfileConnectionState.get(profile);
		}

		public void clearProfileConnectionState ()
		{
		if (Utils.D) {
		Log.d(TAG," Clearing all connection state for dev:" + mDevice.getName());
		}
		for (LocalBluetoothProfile profile :getProfiles()) {
		mProfileConnectionState.put(profile, BluetoothProfile.STATE_DISCONNECTED);
		}
		}

		// TODO: do any of these need to run async on a background thread?
		private void fillData() {
		fetchName();

100644 → 100755

+5 −0

Original line number	Diff line number	Diff line
		@@ -144,6 +144,11 @@ final class CachedBluetoothDeviceManager {
		if (cachedDevice.getBondState() != BluetoothDevice.BOND_BONDED) {
		cachedDevice.setVisible(false);
		mCachedDevices.remove(i);
		} else {
		// For bonded devices, we need to clear the connection status so that
		// when BT is enabled next time, device connection status shall be retrieved
		// by making a binder call.
		cachedDevice.clearProfileConnectionState();
		}
		}
		}