am abd68058: am 3054f595: Merge "Camera2: implement Key.toString()" into mnc-dev

* commit 'abd6805892629cb47f490b8110be4fd8bc27e89b':
  Camera2: implement Key.toString()

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

@@ -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.
          *

core/java/android/hardware/camera2/CaptureRequest.java

@@ -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.
          *

core/java/android/hardware/camera2/CaptureResult.java

@@ -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.
          *