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

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

DO NOT MERGE - Merge TP1A.220624.013 

Merged-In: I9b90f8cdb04f4b96bb8b26eb60db6b842481fca1
Change-Id: I7f4153cc302d774befffffe885efe6aecd9c6f8c
parents 0c33cd39 d722067c

media/codec2/sfplugin/Codec2InfoBuilder.cpp

+3 −2
Original line number Diff line number Diff line
@@ -156,9 +156,10 @@ bool addSupportedProfileLevels( 
    // dynamic metadata as that needs to be frame accurate.)

    supportsHdr |= (mediaType == MIMETYPE_VIDEO_VP9);



    // HDR support implies 10-bit support.

    // HDR support implies 10-bit support. AV1 codecs are also required to

    // support 10-bit per CDD.

    // TODO: directly check this from the component interface

    supports10Bit = (supportsHdr || supportsHdr10Plus);

    supports10Bit = (supportsHdr || supportsHdr10Plus) || (mediaType == MIMETYPE_VIDEO_AV1);



    // If the device doesn't support HDR display, then no codec on the device

    // can advertise support for HDR profiles.

media/libmediaplayerservice/nuplayer/AWakeLock.cpp

+2 −3
Original line number Diff line number Diff line
@@ -59,11 +59,10 @@ bool AWakeLock::acquire() { 
        if (mPowerManager != NULL) {

            sp<IBinder> binder = new BBinder();

            int64_t token = IPCThreadState::self()->clearCallingIdentity();

            binder::Status status = mPowerManager->acquireWakeLock(

            binder::Status status = mPowerManager->acquireWakeLockAsync(

                    binder, POWERMANAGER_PARTIAL_WAKE_LOCK,

                    String16("AWakeLock"), String16("media"),

                    {} /* workSource */, {} /* historyTag */, -1 /* displayId */,

                    nullptr /* callback */);

                    {} /* workSource */, {} /* historyTag */);

            IPCThreadState::self()->restoreCallingIdentity(token);

            if (status.isOk()) {

                mWakeLockToken = binder;

services/camera/libcameraservice/CameraServiceWatchdog.cpp

+4 −2
Original line number Diff line number Diff line
@@ -41,8 +41,10 @@ bool CameraServiceWatchdog::threadLoop() 
            tidToCycleCounterMap[currentThreadId]++;



            if (tidToCycleCounterMap[currentThreadId] >= mMaxCycles) {

                ALOGW("CameraServiceWatchdog triggering kill for pid: %d", getpid());

                kill(getpid(), SIGKILL);

                ALOGW("CameraServiceWatchdog triggering abort for pid: %d", getpid());

                // We use abort here so we can get a tombstone for better

                // debugging.

                abort();

            }

        }

    }