diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2013-10-09 19:44:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-09 19:44:34 +0000 |
| commit | aa0143006f7e873995698dbec2045984b5228fb7 (patch) | |
| tree | b576eef397c9356a55e9a7f52d4a5fa983372f30 /core/java/android | |
| parent | efeb6f3c1b6123188e78b1c8a15e0eb331ebc8ee (diff) | |
| parent | 7b01c5c4d27ebbd739d9e5e0de7eaafbffd8e084 (diff) | |
Merge "Camera2: Properly copy over user tag when cloning requests" into klp-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/hardware/camera2/CaptureRequest.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java index f30bcc541ecf..898f1232b832 100644 --- 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; } /** |