Merge "Incorrect summary for the carkit device" into sc-dev (53241f61) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -1006,7 +1006,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>

		private boolean isProfileConnectedFail() {
		return mIsA2dpProfileConnectedFail \|\| mIsHearingAidProfileConnectedFail
		\|\| mIsHeadsetProfileConnectedFail;
		\|\| (!isConnectedSapDevice() && mIsHeadsetProfileConnectedFail);
		}

		/**
		@@ -1149,6 +1149,12 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
		BluetoothProfile.STATE_CONNECTED;
		}

		private boolean isConnectedSapDevice() {
		SapProfile sapProfile = mProfileManager.getSapProfile();
		return sapProfile != null && sapProfile.getConnectionStatus(mDevice)
		== BluetoothProfile.STATE_CONNECTED;
		}

		public CachedBluetoothDevice getSubDevice() {
		return mSubDevice;
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -441,6 +441,10 @@ public class LocalBluetoothProfileManager {
		return mHearingAidProfile;
		}

		SapProfile getSapProfile() {
		return mSapProfile;
		}

		@VisibleForTesting
		HidProfile getHidProfile() {
		return mHidProfile;