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

[Shell-Trans] Update keyguard occluded status to KeyguardService

Browse Source 
...even if no change involved.
The occluded status could change while screen off, so there will
no visibility change in that transition. But we should allow that
transition to dispatched to KeyguardService so the occluding status
can align.

Bug: 266953625
Test: run testLaunchNoHistoryActivityOnNewDisplay with enable keyguard.
Verify the KeyguardService won't stuck in occluded after test finish.

Change-Id: I7438de3c1892bccaf80ce644548a4c86c078cd17
This commit is contained in:
wilsonshih
2023-02-07 07:57:40 +00:00
parent d491ea0545
commit f9600f1000
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java
View File

@@ -20,6 +20,7 @@ import static android.view.WindowManager.TRANSIT_CHANGE;
import static android.view.WindowManager.TRANSIT_CLOSE;
import static android.view.WindowManager.TRANSIT_FIRST_CUSTOM;
import static android.view.WindowManager.TRANSIT_KEYGUARD_GOING_AWAY;
import static android.view.WindowManager.TRANSIT_KEYGUARD_UNOCCLUDE;
import static android.view.WindowManager.TRANSIT_OPEN;
import static android.view.WindowManager.TRANSIT_TO_BACK;
import static android.view.WindowManager.TRANSIT_TO_FRONT;
@@ -504,7 +505,9 @@ public class Transitions implements RemoteCallable<Transitions> {
mObservers.get(i).onTransitionReady(transitionToken, info, t, finishT);
}
if (!info.getRootLeash().isValid()) {
// Allow to notify keyguard un-occluding state to KeyguardService, which can happen while
// screen-off, so there might no visibility change involved.
if (!info.getRootLeash().isValid() && info.getType() != TRANSIT_KEYGUARD_UNOCCLUDE) {
// Invalid root-leash implies that the transition is empty/no-op, so just do
// housekeeping and return.
ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "Invalid root leash (%s): %s",