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 am: 2d3194900d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23154320

Change-Id: I7a5d215d4cb1497389eb2d471260895e48004354
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Robin Lee
2023-05-12 14:23:03 +00:00
committed by Automerger Merge Worker
parent 3a11a9433d 2d3194900d
commit 4690bd9fb4
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 boolean isDream = (apps[0].taskInfo.topActivityType
final boolean isDream = (apps[0].taskInfo != null
&& apps[0].taskInfo.topActivityType
== WindowConfiguration.ACTIVITY_TYPE_DREAM);
if (!isDream) {
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 boolean isDream = (apps[0].taskInfo.topActivityType
final boolean isDream = (apps[0].taskInfo != null
&& apps[0].taskInfo.topActivityType
== WindowConfiguration.ACTIVITY_TYPE_DREAM);
final SyncRtSurfaceTransactionApplier applier =