commit 83775e28f60f6f0d678e73b4796735f1062f45a6
author vadimt <vadimt@google.com> Mon Sep 09 14:17:56 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Sep 09 14:17:56 2019 -0700
tree 4dce3e175db000e4a6c589ed91ce3cdb299d6704
parent b51136af523e92c8731b6b25dda46234c4856cd2
parent f083b7741a1f1e262817ce8112edfd14a269b5e5

Add one null check to tests
am: f083b7741a

Change-Id: Id2e678bfb216302ef93e593a210edefe5092772a

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);
                 }
             }