commit 32dbee305253e5d52b557a4ccf8612426ef90c25
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Aug 24 01:29:23 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 24 01:29:23 2017 +0000
tree 706bb92dd3da0b3adf8a2f5c8ffecb08fc5f194c
parent 34194fa804ba64c991fd0f43aff4c2f57a030d0d
parent be35a671fb1f97f1812cc12a3fe34d815ccefe71

Merge "Fix check of getSupportedVideoSizes()"

src/com/android/camera/VideoModule.java

diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 9a941c7..e8222f6 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -808,7 +808,8 @@
      */
     private static Point getDesiredPreviewSize(CameraCapabilities capabilities,
           CamcorderProfile profile, Point previewScreenSize) {
-        if (capabilities.getSupportedVideoSizes() == null) {
+        if (capabilities.getSupportedVideoSizes() == null ||
+            capabilities.getSupportedVideoSizes().isEmpty()) {
             // Driver doesn't support separate outputs for preview and video.
             return new Point(profile.videoFrameWidth, profile.videoFrameHeight);
         }