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

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

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

Change-Id: I8d9a53536930d4fdd96957dee9efe5a46151f1eb
parents d76599a8 960daea0

apex/manifest.json

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

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

  "version": 300803100

  "version": 300900000

}

apex/manifest_codec.json

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

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

  "version": 300803100

  "version": 300900000

}

media/libmediaplayerservice/nuplayer/GenericSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ void NuPlayer::GenericSource::onPrepareAsync() { 
            }

            if (mDataSource == nullptr) {

                ALOGD("FileSource local");

                mDataSource = new PlayerServiceFileSource(mFd.get(), mOffset, mLength);

                mDataSource = new PlayerServiceFileSource(dup(mFd.get()), mOffset, mLength);

            }

        }

services/audiopolicy/service/AudioPolicyService.cpp

+7 −5
Original line number Diff line number Diff line
@@ -566,11 +566,13 @@ void AudioPolicyService::updateUidStates_l() 


        auto canCaptureIfInCallOrCommunication = [&](const auto &recordClient) REQUIRES(mLock) {

            bool canCaptureCall = recordClient->canCaptureOutput;

            bool canCaptureCommunication = recordClient->canCaptureOutput

                || recordClient->uid == mPhoneStateOwnerUid

                || isServiceUid(mPhoneStateOwnerUid);

            return !(isInCall && !canCaptureCall)

                && !(isInCommunication && !canCaptureCommunication);

            return !(isInCall && !canCaptureCall);

//TODO(b/160260850): restore restriction to mode owner once fix for misbehaving apps is merged

//            bool canCaptureCommunication = recordClient->canCaptureOutput

//                || recordClient->uid == mPhoneStateOwnerUid

//                || isServiceUid(mPhoneStateOwnerUid);

//            return !(isInCall && !canCaptureCall)

//                && !(isInCommunication && !canCaptureCommunication);

        };



        // By default allow capture if:

services/camera/libcameraservice/api1/Camera2Client.cpp

+10 −2
Original line number Diff line number Diff line
@@ -1777,6 +1777,14 @@ void Camera2Client::notifyError(int32_t errorCode, 
        case hardware::camera2::ICameraDeviceCallbacks::ERROR_CAMERA_BUFFER:

            ALOGW("%s: Received recoverable error %d from HAL - ignoring, requestId %" PRId32,

                    __FUNCTION__, errorCode, resultExtras.requestId);



            if ((hardware::camera2::ICameraDeviceCallbacks::ERROR_CAMERA_REQUEST == errorCode) ||

                    (hardware::camera2::ICameraDeviceCallbacks::ERROR_CAMERA_RESULT == errorCode)) {

                Mutex::Autolock al(mLatestRequestMutex);



                mLatestFailedRequestId = resultExtras.requestId;

                mLatestRequestSignal.signal();

            }

            mCaptureSequencer->notifyError(errorCode, resultExtras);

            return;

        default:
@@ -2303,7 +2311,7 @@ status_t Camera2Client::waitUntilCurrentRequestIdLocked() { 


status_t Camera2Client::waitUntilRequestIdApplied(int32_t requestId, nsecs_t timeout) {

    Mutex::Autolock l(mLatestRequestMutex);

    while (mLatestRequestId != requestId) {

    while ((mLatestRequestId != requestId) && (mLatestFailedRequestId != requestId)) {

        nsecs_t startTime = systemTime();



        auto res = mLatestRequestSignal.waitRelative(mLatestRequestMutex, timeout);
@@ -2312,7 +2320,7 @@ status_t Camera2Client::waitUntilRequestIdApplied(int32_t requestId, nsecs_t tim 
        timeout -= (systemTime() - startTime);

    }



    return OK;

    return (mLatestRequestId == requestId) ? OK : DEAD_OBJECT;

}



void Camera2Client::notifyRequestId(int32_t requestId) {