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

Merge "Check null taskInfo for occlude transitions" into udc-dev

Browse Source
This commit is contained in:
Robin Lee
2023-05-12 14:09:13 +00:00
committed by Android (Google) Code Review
parent 983bf1c574 94d9200101
commit 2d3194900d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -1025,7 +1025,8 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
} }
final RemoteAnimationTarget primary = apps[0]; final RemoteAnimationTarget primary = apps[0];
final boolean isDream = (apps[0].taskInfo.topActivityType final boolean isDream = (apps[0].taskInfo != null
&& apps[0].taskInfo.topActivityType
== WindowConfiguration.ACTIVITY_TYPE_DREAM); == WindowConfiguration.ACTIVITY_TYPE_DREAM);
if (!isDream) { if (!isDream) {
Log.w(TAG, "The occluding app isn't Dream; " Log.w(TAG, "The occluding app isn't Dream; "
@@ -1125,7 +1126,8 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
} }
final RemoteAnimationTarget primary = apps[0]; final RemoteAnimationTarget primary = apps[0];
final boolean isDream = (apps[0].taskInfo.topActivityType final boolean isDream = (apps[0].taskInfo != null
&& apps[0].taskInfo.topActivityType
== WindowConfiguration.ACTIVITY_TYPE_DREAM); == WindowConfiguration.ACTIVITY_TYPE_DREAM);
final SyncRtSurfaceTransactionApplier applier = final SyncRtSurfaceTransactionApplier applier =