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

Check null taskInfo for occlude-by-dream

Browse Source 
Another instance of I479b05a5da896a166a375d30fdf050dc87448f3c
specific to the transition/remote animator for dream starting
over keyguard.

Test: atest android.platform.test.scenario.sysui.lockscreen
Fix: 283335509
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:826c7820829bd1e833d920071a2bb0b88d072de3)
Merged-In: I731f5f10abfcc47e8a54bfa07445f25c2eb977b0
Change-Id: I731f5f10abfcc47e8a54bfa07445f25c2eb977b0
This commit is contained in:
Robin Lee
2023-05-23 02:54:37 +00:00
committed by Cherrypicker Worker
parent af4534f615
commit f293a97274
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java
View File

@@ -141,8 +141,8 @@ public class KeyguardService extends Service {
return apps.length == 0 ? TRANSIT_OLD_KEYGUARD_GOING_AWAY_ON_WALLPAPER
: TRANSIT_OLD_KEYGUARD_GOING_AWAY;
} else if (type == TRANSIT_KEYGUARD_OCCLUDE) {
boolean isOccludeByDream = apps.length > 0 && apps[0].taskInfo.topActivityType
== WindowConfiguration.ACTIVITY_TYPE_DREAM;
boolean isOccludeByDream = apps.length > 0 && apps[0].taskInfo != null
&& apps[0].taskInfo.topActivityType == WindowConfiguration.ACTIVITY_TYPE_DREAM;
if (isOccludeByDream) return TRANSIT_OLD_KEYGUARD_OCCLUDE_BY_DREAM;
return TRANSIT_OLD_KEYGUARD_OCCLUDE;
} else if (type == TRANSIT_KEYGUARD_UNOCCLUDE) {