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

Commit 464ddcb6 authored by Xin Li's avatar Xin Li Committed by Android (Google) Code Review
Browse files

Merge "Merge UP1A.230905.019" into aosp-main-future

parents 1bfc9826 d9c1ec09

media/mtp/MtpProperty.h

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ namespace android { 
class MtpDataPacket;



struct MtpPropertyValue {

    // pointer str initialized to NULL so that free operation

    // is not called for pre-assigned value

    MtpPropertyValue() : str (NULL) {}

    union {

        int8_t          i8;

        uint8_t         u8;

services/audiopolicy/service/AudioPolicyService.cpp

+0 −1
Original line number Diff line number Diff line
@@ -1930,7 +1930,6 @@ void AudioPolicyService::OpRecordAudioMonitor::onFirstRef() 
    // since it controls the mic permission for legacy apps.

    mAppOpsManager.startWatchingMode(mAppOp, VALUE_OR_FATAL(aidl2legacy_string_view_String16(

        mAttributionSource.packageName.value_or(""))),

        AppOpsManager::WATCH_FOREGROUND_CHANGES,

        mOpCallback);

}

services/camera/libcameraservice/device3/Camera3OutputStream.cpp

+4 −4
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ status_t Camera3OutputStream::returnBufferCheckedLocked( 
            bufferDeferred = true;

        } else {

            nsecs_t presentTime = mSyncToDisplay ?

                    syncTimestampToDisplayLocked(captureTime, releaseFence->dup()) : captureTime;

                    syncTimestampToDisplayLocked(captureTime, releaseFence) : captureTime;



            setTransform(transform, true/*mayChangeMirror*/);

            res = native_window_set_buffers_timestamp(mConsumer.get(), presentTime);
@@ -1412,7 +1412,7 @@ void Camera3OutputStream::returnPrefetchedBuffersLocked() { 
    }

}



nsecs_t Camera3OutputStream::syncTimestampToDisplayLocked(nsecs_t t, int releaseFence) {

nsecs_t Camera3OutputStream::syncTimestampToDisplayLocked(nsecs_t t, sp<Fence> releaseFence) {

    nsecs_t currentTime = systemTime();

    if (!mFixedFps) {

        mLastCaptureTime = t;
@@ -1460,8 +1460,8 @@ nsecs_t Camera3OutputStream::syncTimestampToDisplayLocked(nsecs_t t, int release 
                mRefVsyncData = vsyncEventData;

                mReferenceCaptureTime = t;

                mReferenceArrivalTime = currentTime;

                if (releaseFence != -1) {

                    mReferenceFrameFence = new Fence(releaseFence);

                if (releaseFence->isValid()) {

                    mReferenceFrameFence = new Fence(releaseFence->dup());

                } else {

                    mFenceSignalOffset = 0;

                }

services/camera/libcameraservice/device3/Camera3OutputStream.h

+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ class Camera3OutputStream : 
    static constexpr nsecs_t kTimelineThresholdNs = 1000000LL; // 1 millisecond

    static constexpr float kMaxIntervalRatioDeviation = 0.05f;

    static constexpr int kMaxTimelines = 2;

    nsecs_t syncTimestampToDisplayLocked(nsecs_t t, int releaseFence);

    nsecs_t syncTimestampToDisplayLocked(nsecs_t t, sp<Fence> releaseFence);



    // In case of fence being used

    sp<Fence> mReferenceFrameFence;