Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2117346c authored by tim peng's avatar tim peng Committed by Automerger Merge Worker
Browse files

Merge "Incorrect summary for the carkit device" into sc-dev am: 53241f61 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13911070

Change-Id: I68d9cd51e11c73e86d831224a94415808285cd44
parents dbf31b5f 53241f61

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;

    }

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

+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;