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

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

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

Change-Id: Ia027940c263a92d4c381b559ed975e2976a9ac05
parents 1913d00f 2244e725

apex/manifest.json

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

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

  "version": 300802200

  "version": 300802300

}

apex/manifest_codec.json

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

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

  "version": 300802200

  "version": 300802300

}

camera/ndk/include/camera/NdkCameraMetadataTags.h

+5 −4
Original line number Diff line number Diff line
@@ -6054,10 +6054,11 @@ typedef enum acamera_metadata_tag { 
     * </ul></p>

     *

     * <p>The accuracy of the frame timestamp synchronization determines the physical cameras'

     * ability to start exposure at the same time. If the sensorSyncType is CALIBRATED,

     * the physical camera sensors usually run in master-slave mode so that their shutter

     * time is synchronized. For APPROXIMATE sensorSyncType, the camera sensors usually run in

     * master-master mode, and there could be offset between their start of exposure.</p>

     * ability to start exposure at the same time. If the sensorSyncType is CALIBRATED, the

     * physical camera sensors usually run in leader/follower mode where one sensor generates a

     * timing signal for the other, so that their shutter time is synchronized. For APPROXIMATE

     * sensorSyncType, the camera sensors usually run in leader/leader mode, where both sensors

     * use their own timing generator, and there could be offset between their start of exposure.</p>

     * <p>In both cases, all images generated for a particular capture request still carry the same

     * timestamps, so that they can be used to look up the matching frame number and

     * onCaptureStarted callback.</p>

services/camera/libcameraservice/CameraService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1640,7 +1640,7 @@ Status CameraService::connectHelper(const sp<CALLBACK>& cameraCb, const String8& 
                    cameraId.string(), clientName8.string(), clientPid);

        }



        // Enforce client permissions and do basic sanity checks

        // Enforce client permissions and do basic validity checks

        if(!(ret = validateConnectLocked(cameraId, clientName8,

                /*inout*/clientUid, /*inout*/clientPid, /*out*/originalClientPid)).isOk()) {

            return ret;

services/camera/libcameraservice/api1/client2/Parameters.cpp

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ status_t Parameters::initialize(CameraDeviceBase *device, int deviceVersion) { 
    previewFpsRange[1] = fastInfo.bestStillCaptureFpsRange[1];



    // PREVIEW_FRAME_RATE / SUPPORTED_PREVIEW_FRAME_RATES are deprecated, but

    // still have to do something sane for them

    // still have to do something reasonable for them



    // NOTE: Not scaled like FPS range values are.

    int previewFps = fpsFromRange(previewFpsRange[0], previewFpsRange[1]);