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

Commit 6d62cc71 authored by Tim Peng's avatar Tim Peng Committed by tim peng
Browse files

Incorrect summary for the carkit device 

-"Problem connecting. Turn the device off & back on" message shows in the BT setting when DUT pair with carkit and SAP connection is established.
-HFP and SAP can not be connected at the same time.

Bug: 182740717
Test: make -j50 RunSettingsLibRoboTests ROBOTEST_FILTER=CachedBluetoothDeviceTest
Change-Id: Ieadbe137c3098c25d527e0db4b7df9267bfde9f7
parent b8506650

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;