Merge "Camera2: implement Key.toString()" into mnc-dev (3054f595) · Commits · e / os / android_frameworks_base

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

+14 −0

Original line number	Diff line number	Diff line
		@@ -115,6 +115,20 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		return o instanceof Key && ((Key<T>)o).mKey.equals(mKey);
		}

		/**
		* Return this {@link Key} as a string representation.
		*
		* <p>{@code "CameraCharacteristics.Key(%s)"}, where {@code %s} represents
		* the name of this key as returned by {@link #getName}.</p>
		*
		* @return string representation of {@link Key}
		*/
		@NonNull
		@Override
		public String toString() {
		return String.format("CameraCharacteristics.Key(%s)", mKey.getName());
		}

		/**
		* Visible for CameraMetadataNative implementation only; do not use.
		*

+14 −0

Original line number	Diff line number	Diff line
		@@ -149,6 +149,20 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
		return o instanceof Key && ((Key<T>)o).mKey.equals(mKey);
		}

		/**
		* Return this {@link Key} as a string representation.
		*
		* <p>{@code "CaptureRequest.Key(%s)"}, where {@code %s} represents
		* the name of this key as returned by {@link #getName}.</p>
		*
		* @return string representation of {@link Key}
		*/
		@NonNull
		@Override
		public String toString() {
		return String.format("CaptureRequest.Key(%s)", mKey.getName());
		}

		/**
		* Visible for CameraMetadataNative implementation only; do not use.
		*

+14 −0

Original line number	Diff line number	Diff line
		@@ -126,6 +126,20 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
		return o instanceof Key && ((Key<T>)o).mKey.equals(mKey);
		}

		/**
		* Return this {@link Key} as a string representation.
		*
		* <p>{@code "CaptureResult.Key(%s)"}, where {@code %s} represents
		* the name of this key as returned by {@link #getName}.</p>
		*
		* @return string representation of {@link Key}
		*/
		@NonNull
		@Override
		public String toString() {
		return String.format("CaptureResult.Key(%s)", mKey.getName());
		}

		/**
		* Visible for CameraMetadataNative implementation only; do not use.
		*