From 476bea84959ca6f2a6ef304ab040cb16b4ac97c1 Mon Sep 17 00:00:00 2001
From: Shuzhen Wang <shuzhenwang@google.com>
Date: Thu, 9 Feb 2017 13:13:04 -0800
Subject: Revert "Camera2: Temporarily remove surface size 0 check"

This reverts commit bdabb0f582ddc4d9fe3df63030bdbe8e0a74348e.
Bug: 35027811
Test: Use camera from hangouts
---
 core/java/android/hardware/camera2/params/OutputConfiguration.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/java/android/hardware/camera2/params/OutputConfiguration.java b/core/java/android/hardware/camera2/params/OutputConfiguration.java
index d9512944d7ca..522575f09f4d 100644
--- a/core/java/android/hardware/camera2/params/OutputConfiguration.java
+++ b/core/java/android/hardware/camera2/params/OutputConfiguration.java
@@ -259,6 +259,10 @@ public final class OutputConfiguration implements Parcelable {
             throw new IllegalArgumentException("Unknow surface source class type");
         }
 
+        if (surfaceSize.getWidth() == 0 || surfaceSize.getHeight() == 0) {
+            throw new IllegalArgumentException("Surface size needs to be non-zero");
+        }
+
         mSurfaceGroupId = SURFACE_GROUP_ID_NONE;
         mSurfaces = new ArrayList<Surface>();
         mRotation = ROTATION_0;
-- 
cgit v1.2.3-59-g8ed1b