| commit | ba83e61a56e2189fba4be1fe4485ea0ce76a7225 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Wed Jul 10 05:55:16 2013 -0700 |
| committer | The Android Automerger <android-build@google.com> | Wed Jul 10 05:55:16 2013 -0700 |
| tree | 4700e3363f26d6cc69f6eccbf82db96dc39503f1 | |
| parent | a2520db02bead68d4980783c41500ae96511bdf8 [diff] | |
| parent | af06050932e00a03bed7b12c8ac86d90008052f2 [diff] |
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
diff --git a/services/camera/libcameraservice/Camera2Client.cpp b/services/camera/libcameraservice/Camera2Client.cpp index 16688cf..6942006 100644 --- a/services/camera/libcameraservice/Camera2Client.cpp +++ b/services/camera/libcameraservice/Camera2Client.cpp
@@ -616,6 +616,7 @@ case Parameters::STOPPED: case Parameters::WAITING_FOR_PREVIEW_WINDOW: case Parameters::PREVIEW: + case Parameters::STILL_CAPTURE: // OK break; default: