Don't pass empty list of areas.

Some devices won't work well if we pass in an empty list of focusing or metering
areas.

Change-Id: Iff6bfd37a7d551b12c43e88cf8d4934472837257

1 files changed, 10 insertions, 3 deletions

diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java
index a352278..a2266a6 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java
@@ -527,16 +527,23 @@ class AndroidCameraManagerImpl implements CameraManager {
                 mParamsToSet.setAutoWhiteBalanceLock(settings.isAutoWhiteBalanceLocked());
             }
             if (mCapabilities.supports(CameraCapabilities.Feature.FOCUS_AREA)) {
-                mParamsToSet.setFocusAreas(settings.getFocusAreas());
+                if (settings.getFocusAreas().size() != 0) {
+                    mParamsToSet.setFocusAreas(settings.getFocusAreas());
+                }
             }
             if (mCapabilities.supports(CameraCapabilities.Feature.METERING_AREA)) {
-                mParamsToSet.setMeteringAreas(settings.getMeteringAreas());
+                if (settings.getMeteringAreas().size() != 0) {
+                    mParamsToSet.setMeteringAreas(settings.getMeteringAreas());
+                }
             }
             if (settings.getCurrentFlashMode() != CameraCapabilities.FlashMode.NO_FLASH) {
                 mParamsToSet.setFlashMode(stringifier.stringify(settings.getCurrentFlashMode()));
             }
             if (settings.getCurrentSceneMode() != CameraCapabilities.SceneMode.NO_SCENE_MODE) {
-                mParamsToSet.setSceneMode(stringifier.stringify(settings.getCurrentSceneMode()));
+                if (settings.getCurrentSceneMode() != null) {
+                    mParamsToSet
+                            .setSceneMode(stringifier.stringify(settings.getCurrentSceneMode()));
+                }
             }
 
             CameraSettings.GpsData gpsData = settings.getGpsData();