From ced6f8512904c318ca1adf35d7e35f644ed703ad Mon Sep 17 00:00:00 2001
From: Robert Carr <racarr@google.com>
Date: Mon, 8 Apr 2019 16:58:49 -0700
Subject: [PATCH] SurfaceControl#setGeometry: Pass invalid rect instead of
 empty rect

Native code expects an invalid rect instead of an empty rect.

Bug: 123720507
Test: android.wm.cts.SurfaceControlTest
Change-Id: Idbfb128a1266aaf1af51802fe6164ad31d15d2fe
---
 core/jni/android_view_SurfaceControl.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp
index c254266961cf3..1f010240d1b1b 100644
--- a/core/jni/android_view_SurfaceControl.cpp
+++ b/core/jni/android_view_SurfaceControl.cpp
@@ -378,9 +378,13 @@ static void nativeSetGeometry(JNIEnv* env, jclass clazz, jlong transactionObj, j
     Rect source, dst;
     if (sourceObj != NULL) {
         source = rectFromObj(env, sourceObj);
+    } else {
+        source.makeInvalid();
     }
     if (dstObj != NULL) {
         dst = rectFromObj(env, dstObj);
+    } else {
+        dst.makeInvalid();
     }
     transaction->setGeometry(ctrl, source, dst, orientation);
 }