From e57f2dc246532d54229046d319d7b907b23288b3 Mon Sep 17 00:00:00 2001 From: Andrii Kulian Date: Sun, 26 Jan 2020 20:59:07 -0800 Subject: Exempt-From-Owner-Approval: Fix usages of WindowManager.getDefaultDisplay() in f/b Replace the existing usages of now-deprecated API WindowManager.getDefaultDisplay() with WindowMetrics or Context.getDisplay() in frameworks/base. Bug: 128338354 Test: Build, auto test Change-Id: I02d38a022c5e0e6e9d699f03d35b65d6c8126da9 --- test-runner/src/android/test/TouchUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'test-runner') diff --git a/test-runner/src/android/test/TouchUtils.java b/test-runner/src/android/test/TouchUtils.java index 28dc7b2f900c..bb4e00ba1ef9 100644 --- a/test-runner/src/android/test/TouchUtils.java +++ b/test-runner/src/android/test/TouchUtils.java @@ -222,7 +222,8 @@ public class TouchUtils { */ public static void dragViewToBottom(InstrumentationTestCase test, Activity activity, View v, int stepCount) { - int screenHeight = activity.getWindowManager().getDefaultDisplay().getHeight(); + int screenHeight = + activity.getWindowManager().getCurrentWindowMetrics().getSize().getHeight(); int[] xy = new int[2]; v.getLocationOnScreen(xy); -- cgit v1.2.3