From 12a8385b7e403c6e1af6c824d3e77088242f89a7 Mon Sep 17 00:00:00 2001
From: Chien-Yu Chen <cychen@google.com>
Date: Tue, 7 Jul 2015 12:17:22 -0700
Subject: [PATCH] Camera2: implement Key.toString()

Implement toString() for CameraCharacteristics.Key,
CaptureResult.Key, and CaptureRequest.Key.

Bug: 22279124
Change-Id: Ib1076e3f6d7bcbffbb148a7a01f72133daccebb8
---
 .../hardware/camera2/CameraCharacteristics.java    | 14 ++++++++++++++
 .../android/hardware/camera2/CaptureRequest.java   | 14 ++++++++++++++
 .../android/hardware/camera2/CaptureResult.java    | 14 ++++++++++++++
 3 files changed, 42 insertions(+)

diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java
index 835daab219b6a..6c74a9f4632f2 100644
--- a/core/java/android/hardware/camera2/CameraCharacteristics.java
+++ b/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.
          *
diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java
index 33cc962bd1b05..5d7da790e373e 100644
--- a/core/java/android/hardware/camera2/CaptureRequest.java
+++ b/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.
          *
diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java
index 9dee0458b3d88..e071409937887 100644
--- a/core/java/android/hardware/camera2/CaptureResult.java
+++ b/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.
          *