From 121b11ff5b80f1d9e762120f9cd87834b05a5b6a Mon Sep 17 00:00:00 2001 From: Mike Digman Date: Wed, 4 Apr 2018 12:45:24 -0700 Subject: [PATCH] Fix null running task info in SysUI tests Test: failing test now runs Change-Id: If2917258bc2b0532bfac3ad76340c67da7830c27 Fixes: 76420969 --- .../systemui/statusbar/phone/NavigationBarFragment.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java index 58f8baa6ef5be..ca6d5968a43c3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java @@ -103,6 +103,7 @@ import java.io.FileDescriptor; import java.io.PrintWriter; import java.util.List; import java.util.Locale; +import java.util.Optional; /** * Fragment containing the NavigationBarFragment. Contains logic for what happens @@ -1109,8 +1110,11 @@ public class NavigationBarFragment extends Fragment implements Callbacks { public void onActivityRequestedOrientationChanged(int taskId, int requestedOrientation) { // Only hide the icon if the top task changes its requestedOrientation // Launcher can alter its requestedOrientation while it's not on top, don't hide on this - final boolean top = ActivityManagerWrapper.getInstance().getRunningTask().id == taskId; - if (top) setRotateSuggestionButtonState(false); + Optional.ofNullable(ActivityManagerWrapper.getInstance()) + .map(ActivityManagerWrapper::getRunningTask) + .ifPresent(a -> { + if (a.id == taskId) setRotateSuggestionButtonState(false); + }); } }