From b3a934d98485c05489154ef7ffd06bd3d7a583e0 Mon Sep 17 00:00:00 2001 From: vadimt Date: Fri, 26 Apr 2019 17:28:25 -0700 Subject: [PATCH] Quick for for broken OOP tests Change-Id: I1009381a58ca28b3ef922f1c6bb872f811f88716 --- .../launcher3/ui/AbstractLauncherUiTest.java | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java index 15402870f4..86a5769564 100644 --- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java +++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java @@ -111,25 +111,27 @@ public abstract class AbstractLauncherUiTest { mLauncher = new LauncherInstrumentation(instrumentation); // b/130558787; b/131419978 - try { - Class systemProps = Class.forName("android.os.SystemProperties"); - Method getInt = systemProps.getMethod("getInt", String.class, int.class); - int apiLevel = (int) getInt.invoke(null, "ro.product.first_api_level", 0); + if (TestHelpers.isInLauncherProcess()) { + try { + Class systemProps = Class.forName("android.os.SystemProperties"); + Method getInt = systemProps.getMethod("getInt", String.class, int.class); + int apiLevel = (int) getInt.invoke(null, "ro.product.first_api_level", 0); - if (apiLevel >= Build.VERSION_CODES.P) { - setActiveOverlay(NAV_BAR_MODE_GESTURAL_OVERLAY, - LauncherInstrumentation.NavigationModel.ZERO_BUTTON); + if (apiLevel >= Build.VERSION_CODES.P) { + setActiveOverlay(NAV_BAR_MODE_GESTURAL_OVERLAY, + LauncherInstrumentation.NavigationModel.ZERO_BUTTON); + } + if (apiLevel >= Build.VERSION_CODES.O && apiLevel < Build.VERSION_CODES.P) { + setActiveOverlay(NAV_BAR_MODE_2BUTTON_OVERLAY, + LauncherInstrumentation.NavigationModel.TWO_BUTTON); + } + if (apiLevel < Build.VERSION_CODES.O) { + setActiveOverlay(NAV_BAR_MODE_3BUTTON_OVERLAY, + LauncherInstrumentation.NavigationModel.THREE_BUTTON); + } + } catch (Throwable e) { + e.printStackTrace(); } - if (apiLevel >= Build.VERSION_CODES.O && apiLevel < Build.VERSION_CODES.P) { - setActiveOverlay(NAV_BAR_MODE_2BUTTON_OVERLAY, - LauncherInstrumentation.NavigationModel.TWO_BUTTON); - } - if (apiLevel < Build.VERSION_CODES.O) { - setActiveOverlay(NAV_BAR_MODE_3BUTTON_OVERLAY, - LauncherInstrumentation.NavigationModel.THREE_BUTTON); - } - } catch (Throwable e) { - e.printStackTrace(); } }