Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix null running task info in SysUI tests" into pi-dev

Browse Source 
am: 997e7b7ea4

Change-Id: I6fb0654d6fe06f23cc1bac282f5005693e523bf7
This commit is contained in:
Mike Digman
2018-04-11 09:47:37 -07:00
committed by android-build-merger
parent 364100b737 997e7b7ea4
commit 1a78073397
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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