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

Commit d2227cec authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Make change and version bump to r_aml_300800500 for mainline module file: apex/manifest_codec.json 

Change-Id: I6b894add1ecace530626f1c9536dcb23accf6cd8
parents a592a748 8565bf27

apex/manifest.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "com.android.media",

  "version": 300800400

  "version": 300800500

}

apex/manifest_codec.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "com.android.media.swcodec",

  "version": 300800400

  "version": 300800500

}

apex/testing/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ apex_test { 
    manifest: "test_manifest.json",

    file_contexts: ":com.android.media-file_contexts",

    defaults: ["com.android.media-defaults"],

    prebuilts: ["sdkinfo_45"],

    installable: false,

}

media/libmediaplayerservice/nuplayer/GenericSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1159,7 +1159,7 @@ status_t NuPlayer::GenericSource::doSeek(int64_t seekTimeUs, MediaPlayerSeekMode 
        readBuffer(MEDIA_TRACK_TYPE_VIDEO, seekTimeUs, mode, &actualTimeUs);



        if (mode != MediaPlayerSeekMode::SEEK_CLOSEST) {

            seekTimeUs = actualTimeUs;

            seekTimeUs = std::max<int64_t>(0, actualTimeUs);

        }

        mVideoLastDequeueTimeUs = actualTimeUs;

    }