commit aa0143006f7e873995698dbec2045984b5228fb7
author Eino-Ville Talvala <etalvala@google.com> Wed Oct 09 19:44:33 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 09 19:44:34 2013 +0000
tree b576eef397c9356a55e9a7f52d4a5fa983372f30
parent efeb6f3c1b6123188e78b1c8a15e0eb331ebc8ee
parent 7b01c5c4d27ebbd739d9e5e0de7eaafbffd8e084

Merge "Camera2: Properly copy over user tag when cloning requests" into klp-dev

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

diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java
index f30bcc5..898f123 100644
--- a/core/java/android/hardware/camera2/CaptureRequest.java
+++ b/core/java/android/hardware/camera2/CaptureRequest.java
@@ -82,6 +82,7 @@
     private CaptureRequest(CaptureRequest source) {
         mSettings = new CameraMetadataNative(source.mSettings);
         mSurfaceSet = (HashSet<Surface>) source.mSurfaceSet.clone();
+        mUserTag = source.mUserTag;
     }
 
     /**