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

Commit e3566007 authored by Andy Hung's avatar Andy Hung Committed by Android Git Automerger
Browse files

am feeaa0ba: am f32d06d8: Merge "Allow set loop and position before write for... 

am feeaa0ba: am f32d06d8: Merge "Allow set loop and position before write for static AudioTracks" into lmp-mr1-dev

* commit 'feeaa0ba':
  Allow set loop and position before write for static AudioTracks
parents 5f84109c feeaa0ba

media/java/android/media/AudioTrack.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -1070,7 +1070,7 @@ public class AudioTrack 
     *    {@link #ERROR_INVALID_OPERATION}

     *    {@link #ERROR_INVALID_OPERATION}

     */

     */

    public int setPlaybackHeadPosition(int positionInFrames) {

    public int setPlaybackHeadPosition(int positionInFrames) {

        if (mDataLoadMode == MODE_STREAM || mState != STATE_INITIALIZED ||

        if (mDataLoadMode == MODE_STREAM || mState == STATE_UNINITIALIZED ||

                getPlayState() == PLAYSTATE_PLAYING) {

                getPlayState() == PLAYSTATE_PLAYING) {

            return ERROR_INVALID_OPERATION;

            return ERROR_INVALID_OPERATION;

        }

        }
@@ -1100,7 +1100,7 @@ public class AudioTrack 
     *    {@link #ERROR_INVALID_OPERATION}

     *    {@link #ERROR_INVALID_OPERATION}

     */

     */

    public int setLoopPoints(int startInFrames, int endInFrames, int loopCount) {

    public int setLoopPoints(int startInFrames, int endInFrames, int loopCount) {

        if (mDataLoadMode == MODE_STREAM || mState != STATE_INITIALIZED ||

        if (mDataLoadMode == MODE_STREAM || mState == STATE_UNINITIALIZED ||

                getPlayState() == PLAYSTATE_PLAYING) {

                getPlayState() == PLAYSTATE_PLAYING) {

            return ERROR_INVALID_OPERATION;

            return ERROR_INVALID_OPERATION;

        }

        }