From f083b7741a1f1e262817ce8112edfd14a269b5e5 Mon Sep 17 00:00:00 2001 From: vadimt Date: Fri, 6 Sep 2019 18:08:22 -0700 Subject: [PATCH] Add one null check to tests Change-Id: Ib4b50ac06d44b1811e0388bc373fe420fa5570fd --- .../com/android/launcher3/ui/PortraitLandscapeRunner.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java b/tests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java index ddcb4da883..80bb3edddd 100644 --- a/tests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java +++ b/tests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java @@ -44,8 +44,11 @@ class PortraitLandscapeRunner implements TestRule { } finally { mTest.mDevice.setOrientationNatural(); mTest.executeOnLauncher(launcher -> - launcher.getRotationHelper().forceAllowRotationForTesting( - false)); + { + if (launcher != null) { + launcher.getRotationHelper().forceAllowRotationForTesting(false); + } + }); mTest.mLauncher.setExpectedRotation(Surface.ROTATION_0); } }