Merge cherrypicks of [6641442] into qt-release (5caf740b) · Commits · e / os / android_frameworks_base

core/java/android/hardware/camera2/CameraCharacteristics.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -85,7 +85,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		*
		* @hide
		*/
		public Key(String name, String fallbackName, Class<T> type) {
		@UnsupportedAppUsage
		public Key(@NonNull String name, @NonNull String fallbackName, @NonNull Class<T> type) {
		mKey = new CameraMetadataNative.Key<T>(name, fallbackName, type);
		}

+5 −1

Original line number	Diff line number	Diff line
		@@ -89,7 +89,8 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
		*
		* @hide
		*/
		public Key(String name, String fallbackName, Class<T> type) {
		@UnsupportedAppUsage
		public Key(@NonNull String name, @NonNull String fallbackName, @NonNull Class<T> type) {
		mKey = new CameraMetadataNative.Key<T>(name, fallbackName, type);
		}

		@@ -4251,6 +4252,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
		* @see CaptureResult#SENSOR_TIMESTAMP
		* @hide
		*/
		@UnsupportedAppUsage
		public static final Key<long[]> STATISTICS_OIS_TIMESTAMPS =
		new Key<long[]>("android.statistics.oisTimestamps", long[].class);

		@@ -4270,6 +4272,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
		* <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p>
		* @hide
		*/
		@UnsupportedAppUsage
		public static final Key<float[]> STATISTICS_OIS_X_SHIFTS =
		new Key<float[]>("android.statistics.oisXShifts", float[].class);

		@@ -4289,6 +4292,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
		* <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p>
		* @hide
		*/
		@UnsupportedAppUsage
		public static final Key<float[]> STATISTICS_OIS_Y_SHIFTS =
		new Key<float[]>("android.statistics.oisYShifts", float[].class);