Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce3e2c05 authored by Mike Digman's avatar Mike Digman Committed by android-build-merger
Browse files

Merge "Fix null running task info in SysUI tests" into pi-dev am: 997e7b7e 

am: 1a780733

Change-Id: I3dc53c8a0a5a6bca8b69f8e5b30002adc7042849
parents 9c6579f3 1a780733

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java

+6 −2
Original line number Diff line number Diff line
@@ -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);

                    });

        }

    }