Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937" into stage-aosp-master (79a6cde9) · Commits · e / os / android_frameworks_av

camera/CaptureResult.cpp

+8 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,10 @@ status_t CaptureResultExtras::readFromParcel(const android::Parcel *parcel) {
		parcel->readInt64(&lastCompletedRegularFrameNumber);
		parcel->readInt64(&lastCompletedReprocessFrameNumber);
		parcel->readInt64(&lastCompletedZslFrameNumber);

		parcel->readBool(&hasReadoutTimestamp);
		if (hasReadoutTimestamp) {
		parcel->readInt64(&readoutTimestamp);
		}
		return OK;
		}

		@@ -82,6 +85,10 @@ status_t CaptureResultExtras::writeToParcel(android::Parcel *parcel) const {
		parcel->writeInt64(lastCompletedRegularFrameNumber);
		parcel->writeInt64(lastCompletedReprocessFrameNumber);
		parcel->writeInt64(lastCompletedZslFrameNumber);
		parcel->writeBool(hasReadoutTimestamp);
		if (hasReadoutTimestamp) {
		parcel->writeInt64(readoutTimestamp);
		}

		return OK;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,5 +48,5 @@ interface ICameraServiceProxy
		/**
		* Checks if the camera has been disabled via device policy.
		*/
		boolean isCameraDisabled();
		boolean isCameraDisabled(int userId);
		}

+14 −1

Original line number	Diff line number	Diff line
		@@ -103,6 +103,17 @@ struct CaptureResultExtras : public android::Parcelable {
		*/
		int64_t lastCompletedZslFrameNumber;

		/**
		* Whether the readoutTimestamp variable is valid and should be used.
		*/
		bool hasReadoutTimestamp;

		/**
		* The readout timestamp of the capture. Its value is equal to the
		* start-of-exposure timestamp plus the exposure time (and a possible fixed
		* offset due to sensor crop).
		*/
		int64_t readoutTimestamp;

		/**
		* Constructor initializes object as invalid by setting requestId to be -1.
		@@ -118,7 +129,9 @@ struct CaptureResultExtras : public android::Parcelable {
		errorPhysicalCameraId(),
		lastCompletedRegularFrameNumber(-1),
		lastCompletedReprocessFrameNumber(-1),
		lastCompletedZslFrameNumber(-1) {
		lastCompletedZslFrameNumber(-1),
		hasReadoutTimestamp(false),
		readoutTimestamp(0) {
		}

		/**

+3 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,9 @@ public:
		TIMESTAMP_BASE_SENSOR = 1,
		TIMESTAMP_BASE_MONOTONIC = 2,
		TIMESTAMP_BASE_REALTIME = 3,
		TIMESTAMP_BASE_CHOREOGRAPHER_SYNCED = 4
		TIMESTAMP_BASE_CHOREOGRAPHER_SYNCED = 4,
		TIMESTAMP_BASE_READOUT_SENSOR = 5,
		TIMESTAMP_BASE_MAX = TIMESTAMP_BASE_READOUT_SENSOR,
		};
		enum MirrorModeType {
		MIRROR_MODE_AUTO = 0,

+4 −0

Original line number	Diff line number	Diff line
		@@ -2198,6 +2198,10 @@ typedef enum acamera_metadata_tag {
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraManager.html#turnOnTorchWithStrengthLevel">CameraManager#turnOnTorchWithStrengthLevel</a>.
		* If this value is equal to 1, flashlight brightness control is not supported.
		* The value for this key will be null for devices with no flash unit.</p>
		* <p>The maximum value is guaranteed to be safe to use for an indefinite duration in
		* terms of device flashlight lifespan, but may be too bright for comfort for many
		* use cases. Use the default torch brightness value to avoid problems with an
		* over-bright flashlight.</p>
		*/
		ACAMERA_FLASH_INFO_STRENGTH_MAXIMUM_LEVEL = // int32
		ACAMERA_FLASH_INFO_START + 2,