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

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

Snap for 6470414 from 4dce6063 to mainline-release 

Change-Id: Ia6c07a298f78083b6f9d76ee77a746dce7890a61
parents f1a5af0e 4dce6063

include/drm/TEST_MAPPING

0 → 100644
+26 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "GtsMediaTestCases",

      "options" : [

        {

          "include-annotation": "android.platform.test.annotations.Presubmit"

        },

        {

          "include-filter": "com.google.android.media.gts.WidevineGenericOpsTests"

        }

      ]

    },

    {

      "name": "GtsExoPlayerTestCases",

      "options" : [

        {

          "include-annotation": "android.platform.test.annotations.SocPresubmit"

        },

        {

          "include-filter": "com.google.android.exoplayer.gts.DashTest#testWidevine23FpsH264Fixed"

        }

      ]

    }

  ]

}

include/media/TEST_MAPPING

0 → 100644
+7 −0
Original line number Diff line number Diff line 
{

  "imports": [

    {

      "path": "frameworks/av/include/drm"

    }

  ]

}

include/private/media/TEST_MAPPING

0 → 100644
+7 −0
Original line number Diff line number Diff line 
{

  "imports": [

    {

      "path": "frameworks/av/include/drm"

    }

  ]

}

media/extractors/mkv/MatroskaExtractor.cpp

+4 −0
Original line number Diff line number Diff line
@@ -814,11 +814,13 @@ media_status_t MatroskaSource::readBlock() { 
            int32_t sampleRate;

            if (!AMediaFormat_getInt32(trackInfo->mMeta, AMEDIAFORMAT_KEY_SAMPLE_RATE,

                                       &sampleRate)) {

                mbuf->release();

                return AMEDIA_ERROR_MALFORMED;

            }

            int64_t durationUs;

            if (!AMediaFormat_getInt64(trackInfo->mMeta, AMEDIAFORMAT_KEY_DURATION,

                                       &durationUs)) {

                mbuf->release();

                return AMEDIA_ERROR_MALFORMED;

            }

            // TODO: Explore if this can be handled similar to MPEG4 extractor where padding is
@@ -981,6 +983,7 @@ media_status_t MatroskaSource::mp3FrameRead( 
        while (mPendingFrames.empty()) {

            media_status_t err = readBlock();

            if (err != OK) {

                buffer->release();

                clearPendingFrames();

                return err;

            }
@@ -1000,6 +1003,7 @@ media_status_t MatroskaSource::mp3FrameRead( 
            while (mPendingFrames.empty()) {

                media_status_t err = readBlock();

                if (err != OK) {

                    buffer->release();

                    clearPendingFrames();

                    return err;

                }

services/audiopolicy/service/AudioPolicyService.cpp

+2 −2
Original line number Diff line number Diff line
@@ -978,7 +978,7 @@ bool AudioPolicyService::UidPolicy::isUidActive(uid_t uid) { 
        }

    }

    ActivityManager am;

    bool active = am.isUidActiveOrForeground(uid, String16("audioserver"));

    bool active = am.isUidActive(uid, String16("audioserver"));

    {

        Mutex::Autolock _l(mLock);

        mCachedUids.insert(std::pair<uid_t,
@@ -1023,7 +1023,7 @@ int AudioPolicyService::UidPolicy::getUidState(uid_t uid) { 
        }

    }

    ActivityManager am;

    bool active = am.isUidActiveOrForeground(uid, String16("audioserver"));

    bool active = am.isUidActive(uid, String16("audioserver"));

    int state = ActivityManager::PROCESS_STATE_UNKNOWN;

    if (active) {

        state = am.getUidProcessState(uid, String16("audioserver"));