commit 1ec42e3f7e0863e9878a9987cf81c821e30cb553
author Vishnu Nair <vishnun@google.com> Tue Nov 10 00:46:09 2020 +0000
committer Xin Li <delphij@google.com> Thu Dec 03 08:48:54 2020 +0000
tree 5606f238f87c12745594f8ded920d1b1ecf10956
parent 6d0e585056492c83e83e6730d7246c1c052ea5e9

resolve merge conflicts of I791fa82b54ddd7b2bca26f05409ec830187416c3 to rvc-d1-dev-plus-aosp
Bug: 172866897

Merged-In: I2b46b9bcde9d27d94aaa1917987d6a77dd1ff47d
Change-Id: I19229154233e2b7e35236e16386023cd78ecc854
(cherry picked from commit c69f30165892ca95dd796f71255c980e5051fdf0)

tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/CapturedActivity.java

diff --git a/tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/CapturedActivity.java b/tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/CapturedActivity.java
index 84e1629..9401370 100644
--- a/tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/CapturedActivity.java
+++ b/tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/CapturedActivity.java
@@ -262,7 +262,6 @@
             final Display defaultDisplay = displayManager.getDisplay(Display.DEFAULT_DISPLAY);
             final int rotation = defaultDisplay.getRotation();
             Display.Mode mode = defaultDisplay.getMode();
-            size = new Point(mode.getPhysicalWidth(), mode.getPhysicalHeight());
 
             View testAreaView = findViewById(android.R.id.content);
             Rect boundsToCheck = new Rect(0, 0, testAreaView.getWidth(), testAreaView.getHeight());