diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-06-28 17:15:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-28 17:15:54 +0000 |
| commit | 778f857c9ac5f374bd953b4b4534821508321e3c (patch) | |
| tree | 7e57308428be9aca2dea1bf4913b29c97cf324f2 | |
| parent | 575d3c1fbc0c2fd76dd5f9fb7a834c9ef2b1d48c (diff) | |
| parent | 3893e5c0ba19680565d070bc3ae31e5763833982 (diff) | |
| download | Camera2-778f857c9ac5f374bd953b4b4534821508321e3c.tar.gz | |
Merge "VideoModule: Check for valid content values when storing videos" am: 3893e5c0ba
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2635206
Change-Id: I727634e153b496325c4bce3df30301ad2b7421a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index abbae5265..038deb197 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -1509,7 +1509,7 @@ public class VideoModule extends CameraModule // if no file save is needed, we can show the post capture UI now showCaptureResult(); } - if (mVideoFileDescriptor != null) { + if ((mVideoFileDescriptor != null) && (mCurrentVideoValues != null)) { saveVideo(); } } |