Merge "Camera: Annotate the Key constructors with nullability." (e739064b) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -16745,7 +16745,7 @@ package android.hardware.camera2 {
		}

		public static final class CameraCharacteristics.Key<T> {
		ctor public CameraCharacteristics.Key(String, Class<T>);
		ctor public CameraCharacteristics.Key(@NonNull String, @NonNull Class<T>);
		method @NonNull public String getName();
		}

		@@ -17119,7 +17119,7 @@ package android.hardware.camera2 {
		}

		public static final class CaptureRequest.Key<T> {
		ctor public CaptureRequest.Key(String, Class<T>);
		ctor public CaptureRequest.Key(@NonNull String, @NonNull Class<T>);
		method @NonNull public String getName();
		}

		@@ -17214,7 +17214,7 @@ package android.hardware.camera2 {
		}

		public static final class CaptureResult.Key<T> {
		ctor public CaptureResult.Key(String, Class<T>);
		ctor public CaptureResult.Key(@NonNull String, @NonNull Class<T>);
		method @NonNull public String getName();
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* they may be useful for testing purposes and for defining custom camera
		* characteristics.</p>
		*/
		public Key(String name, Class<T> type) {
		public Key(@NonNull String name, @NonNull Class<T> type) {
		mKey = new CameraMetadataNative.Key<T>(name, type);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -120,7 +120,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
		* {@link CaptureRequest}, and not need to construct their own Key objects. However, they
		* may be useful for testing purposes and for defining custom capture request fields.</p>
		*/
		public Key(String name, Class<T> type) {
		public Key(@NonNull String name, @NonNull Class<T> type) {
		mKey = new CameraMetadataNative.Key<T>(name, type);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -101,7 +101,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
		* {@link CaptureResult}, and not need to construct their own Key objects. However, they may
		* be useful for testing purposes and for defining custom capture result fields.</p>
		*/
		public Key(String name, Class<T> type) {
		public Key(@NonNull String name, @NonNull Class<T> type) {
		mKey = new CameraMetadataNative.Key<T>(name, type);
		}