| commit | c2c520950a7f4b72ad66a19d391fedddc96b88c1 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Thu Sep 25 22:36:58 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 25 22:36:59 2014 +0000 |
| tree | e1c5d53939c22030c212b030243166218fb34db2 | |
| parent | 42dad8041823833106311ff43cc17a8b3c583d32 [diff] | |
| parent | 52571b9032fedb90ca1fabbda90d0313d44adfb9 [diff] |
Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev
diff --git a/core/java/android/hardware/camera2/legacy/RequestThreadManager.java b/core/java/android/hardware/camera2/legacy/RequestThreadManager.java index 3b41359..a7ea89c 100644 --- a/core/java/android/hardware/camera2/legacy/RequestThreadManager.java +++ b/core/java/android/hardware/camera2/legacy/RequestThreadManager.java
@@ -328,6 +328,7 @@ resetJpegSurfaceFormats(mCallbackOutputs); mPreviewOutputs.clear(); mCallbackOutputs.clear(); + mJpegSurfaceIds.clear(); mPreviewTexture = null; int facing = mCharacteristics.get(CameraCharacteristics.LENS_FACING);