commit d9144ef07ee4fb7afcedfd39599d4e1b2b8c2630
author vadimt <vadimt@google.com> Mon Sep 09 14:24:05 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Sep 09 14:24:05 2019 -0700
tree e6915f96746372c7e7a9cd26a1ac2a28bfdba8e8
parent bed2fa878742a0d475895789a70977c2346c1b56
parent 83775e28f60f6f0d678e73b4796735f1062f45a6

Add one null check to tests am: f083b7741a
am: 83775e28f6

Change-Id: I93c7d0dd0cc2bf0c41824a090e1cf50375453acb

tests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java

diff --git a/tests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java b/tests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java
index ddcb4da..80bb3ed 100644
--- a/tests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java
+++ b/tests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java
@@ -44,8 +44,11 @@
                 } finally {
                     mTest.mDevice.setOrientationNatural();
                     mTest.executeOnLauncher(launcher ->
-                            launcher.getRotationHelper().forceAllowRotationForTesting(
-                                    false));
+                    {
+                        if (launcher != null) {
+                            launcher.getRotationHelper().forceAllowRotationForTesting(false);
+                        }
+                    });
                     mTest.mLauncher.setExpectedRotation(Surface.ROTATION_0);
                 }
             }