summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2014-04-28 16:31:11 -0700
committerRuben Brunk <rubenbrunk@google.com>2014-05-16 23:25:51 -0700
commitf967a5486a78db244624fde4c105aa5e6fa914b9 (patch)
tree4b4f9cfe09af0e82e625b13f4818af297000dbc3 /core/java
parent241cdab7597c9f6f203057125c9d629c285d574d (diff)
downloadframeworks_base-f967a5486a78db244624fde4c105aa5e6fa914b9.zip
frameworks_base-f967a5486a78db244624fde4c105aa5e6fa914b9.tar.gz
frameworks_base-f967a5486a78db244624fde4c105aa5e6fa914b9.tar.bz2
camera2: Plumb DngCreator to native library.
Change-Id: Ic58bf6cf5086808b503460ef8e451fc0d6f1f850
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/hardware/camera2/CameraCharacteristics.java10
-rw-r--r--core/java/android/hardware/camera2/CaptureResult.java10
2 files changed, 20 insertions, 0 deletions
diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java
index 1127fe5..7cc6d1d 100644
--- a/core/java/android/hardware/camera2/CameraCharacteristics.java
+++ b/core/java/android/hardware/camera2/CameraCharacteristics.java
@@ -30,6 +30,8 @@ import java.util.List;
* through the {@link CameraManager CameraManager}
* interface in addition to through the CameraDevice interface.</p>
*
+ * <p>{@link CameraCharacteristics} objects are immutable.</p>
+ *
* @see CameraDevice
* @see CameraManager
*/
@@ -47,6 +49,14 @@ public final class CameraCharacteristics extends CameraMetadata {
mProperties = properties;
}
+ /**
+ * Returns a copy of the underlying {@link CameraMetadataNative}.
+ * @hide
+ */
+ public CameraMetadataNative getNativeCopy() {
+ return new CameraMetadataNative(mProperties);
+ }
+
@Override
public <T> T get(Key<T> key) {
return mProperties.get(key);
diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java
index d79f4b0..f91fcb9 100644
--- a/core/java/android/hardware/camera2/CaptureResult.java
+++ b/core/java/android/hardware/camera2/CaptureResult.java
@@ -33,6 +33,8 @@ import android.util.Rational;
* capture. The result also includes additional metadata about the state of the
* camera device during the capture.</p>
*
+ * <p>{@link CameraCharacteristics} objects are immutable.</p>
+ *
*/
public final class CaptureResult extends CameraMetadata {
@@ -58,6 +60,14 @@ public final class CaptureResult extends CameraMetadata {
mSequenceId = sequenceId;
}
+ /**
+ * Returns a copy of the underlying {@link CameraMetadataNative}.
+ * @hide
+ */
+ public CameraMetadataNative getNativeCopy() {
+ return new CameraMetadataNative(mResults);
+ }
+
@Override
public <T> T get(Key<T> key) {
return mResults.get(key);