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

Commit ddb08ad4 authored by Xin Li's avatar Xin Li
Browse files

Merge commit 'cd6ab2ea' into stage-aosp-master 

Change-Id: I01508478f7346cb6bc1cd69d41fad1ab74acf9de
parents 748284b2 cd6ab2ea

android/app/src/com/android/bluetooth/avrcp/Avrcp.java

+1 −1
Original line number Diff line number Diff line
@@ -855,7 +855,7 @@ public final class Avrcp { 
            // As a result of that, if we pause the music, on carkits the

            // Play status indicator will continue to display "Playing"

            // for 3 more seconds which can be confusing.

            if (mAudioManagerIsPlaying

            if ((mAudioManagerIsPlaying && newState.getState() != PlaybackState.STATE_PLAYING)

                    || (controllerState == null && mAudioManager != null

                               && mAudioManager.isMusicActive())) {

                // Use AudioManager playback state if we don't have the state