commit 01f8fb91326aba7c4c5a7193a825528dd910393f
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Sep 09 17:02:15 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 09 17:02:15 2019 +0000
tree b9bebb8c12a074607674b290e13674baafe240dd
parent f083b7741a1f1e262817ce8112edfd14a269b5e5
parent 2bad570b40506bab04650711db3a3155043554c8

Merge "Support for getting Launcher Pss by tests" into ub-launcher3-qt-qpr1-dev

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