Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0fb9b18 authored by Robin Lee's avatar Robin Lee Committed by Automerger Merge Worker
Browse files

Merge "Check null taskInfo for occlude transitions" into udc-dev am: 2d319490 am: 4690bd9f 

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



Change-Id: Ia2fdc1a57970742fbfc410d2f24eb4d964a4fa03
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e437cc1c 4690bd9f

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+4 −2
Original line number Diff line number Diff line
@@ -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 =