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

* commit 'aa0143006f7e873995698dbec2045984b5228fb7': Camera2: Properly copy over user tag when cloning requests
2013-10-09 12:46:27 -07:00
parent 1ee0c1c3d0 aa0143006f
commit 8233b6ebd7
1 changed files with 1 additions and 0 deletions
--- a/core/java/android/hardware/camera2/CaptureRequest.java
+++ b/core/java/android/hardware/camera2/CaptureRequest.java
@@ -82,6 +82,7 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable {
    private CaptureRequest(CaptureRequest source) {
        mSettings = new CameraMetadataNative(source.mSettings);
        mSurfaceSet = (HashSet<Surface>) source.mSurfaceSet.clone();
+        mUserTag = source.mUserTag;
    }

    /**