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

Commit 6f6c4045 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8625096 from c04fbb81 to tm-qpr1-release

Change-Id: I2cda501734ec9c50b85ebb30325c22f082ee6c67
parents 3ce21ce6 c04fbb81
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -252,6 +252,14 @@ public class MediaPlayerWrapper {
                    Log.d(TAG, "  └ Current queueItem: " + qitem);
                    Log.d(TAG, "  └ Current metadata : " + mdata);
                }

                // Some player do not provide full song info in queue item, allow case
                // that only title and artist match.
                if (Objects.equals(qitem.title, mdata.title)
                        && Objects.equals(qitem.artist, mdata.artist)) {
                    Log.d(TAG, mPackageName + " Only Title and Artist info sync for metadata");
                    return true;
                }
                return false;
            }
        }
+0 −9
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ public class CsipSetCoordinatorStateMachine extends StateMachine {
    private Disconnecting mDisconnecting;
    private Connected mConnected;
    private int mLastConnectionState = -1;
    private int mNumReceivers = 0;

    private CsipSetCoordinatorService mService;
    private CsipSetCoordinatorNativeInterface mNativeInterface;
@@ -513,14 +512,6 @@ public class CsipSetCoordinatorStateMachine extends StateMachine {
        }
    }

    public void setNumReceivers(int numReceivers) {
        mNumReceivers = numReceivers;
    }

    public int getNumReceivers() {
        return mNumReceivers;
    }

    // This method does not check for error condition (newState == prevState)
    private void csipConnectionState(int newState, int prevState) {
        log("Connection state " + mDevice + ": " + profileStateToString(prevState) + "->"
+6 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ public class BluetoothInCallService extends InCallService {
    private BluetoothCall mOldHeldCall = null;
    private boolean mHeadsetUpdatedRecently = false;
    private boolean mIsDisconnectedTonePlaying = false;
    private boolean mIsTerminatedByClient = false;

    private static final Object LOCK = new Object();
    private BluetoothHeadsetProxy mBluetoothHeadset;
@@ -1287,6 +1288,10 @@ public class BluetoothInCallService extends InCallService {
        case DisconnectCause.REJECTED:
            return BluetoothLeCallControl.TERMINATION_REASON_REMOTE_HANGUP;
        case DisconnectCause.LOCAL:
            if (mIsTerminatedByClient) {
                mIsTerminatedByClient = false;
                return BluetoothLeCallControl.TERMINATION_REASON_CLIENT_HANGUP;
            }
            return BluetoothLeCallControl.TERMINATION_REASON_SERVER_HANGUP;
        case DisconnectCause.ERROR:
            return BluetoothLeCallControl.TERMINATION_REASON_NETWORK_CONGESTION;
@@ -1413,6 +1418,7 @@ public class BluetoothInCallService extends InCallService {
                if (mCallInfo.isNullCall(call)) {
                    result = BluetoothLeCallControl.RESULT_ERROR_UNKNOWN_CALL_ID;
                } else {
                    mIsTerminatedByClient = true;
                    call.disconnect();
                }
                mBluetoothLeCallControl.requestResult(requestId, result);