diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-07 23:34:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-07 23:34:41 +0000 |
| commit | 2e3ecc02fa4465c8d0242e51eb6dafbee52f2d67 (patch) | |
| tree | af9e49bcfd49d4ff189d76bd7b7edfaed3c9dda7 | |
| parent | b08d27069a5acfe6428ce50aff9471de54aea872 (diff) | |
| parent | 475d22e9a21c48a64a3f6e443ec1d8fa5c4385d9 (diff) | |
| download | cts-2e3ecc02fa4465c8d0242e51eb6dafbee52f2d67.tar.gz | |
Merge "Updating surface validator code to limit validation to actual app content" into stage-aosp-rvc-ts-dev am: 475d22e9a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12243429
Change-Id: I36e5cdf387540f9e75a4302a0e349c342452abae
| -rw-r--r-- | tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/CapturedActivity.java | 9 |
1 files changed, 8 insertions, 1 deletions
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 84cbd003470..ab35c55a904 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 @@ -250,9 +250,16 @@ public class CapturedActivity extends Activity { Display display = getWindow().getDecorView().getDisplay(); Point size = new Point(); DisplayMetrics metrics = new DisplayMetrics(); - display.getRealSize(size); display.getMetrics(metrics); + final DisplayManager displayManager = + (DisplayManager) CapturedActivity.this.getSystemService( + Context.DISPLAY_SERVICE); + 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()); int[] topLeft = new int[2]; |