diff options
| author | Andrii Kulian <akulian@google.com> | 2020-03-27 01:16:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-27 01:16:24 +0000 |
| commit | 5c13904c689b30910ec3ca59873d18ce25314a1a (patch) | |
| tree | 938a38e9b4df3e9a688260a096941682ec8084b6 /media/tests | |
| parent | b5c6b6a8798e4548651ab366be46f7c74391173d (diff) | |
| parent | 363edf449a20f7a2568ac19fa2f169debda85f79 (diff) | |
Merge "Report bounds instead of size in WindowMetrics" into rvc-dev am: 363edf449a
Change-Id: I80833bd0256a350662a90c2c4f73b9d1fee9273e
Diffstat (limited to 'media/tests')
| -rw-r--r-- | media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraTestUtils.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraTestUtils.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraTestUtils.java index 25220951dd7b..daeb731ad457 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraTestUtils.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraTestUtils.java @@ -2210,14 +2210,14 @@ public class CameraTestUtils extends Assert { } public static Size getPreviewSizeBound(WindowManager windowManager, Size bound) { - Size windowSize = windowManager.getCurrentWindowMetrics().getSize(); + Rect windowBounds = windowManager.getCurrentWindowMetrics().getBounds(); - int width = windowSize.getWidth(); - int height = windowSize.getHeight(); + int width = windowBounds.width(); + int height = windowBounds.height(); if (height > width) { height = width; - width = windowSize.getHeight(); + width = windowBounds.height(); } if (bound.getWidth() <= width && |