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

Commit 2d319490 authored by Robin Lee's avatar Robin Lee Committed by Android (Google) Code Review
Browse files

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

parents 983bf1c5 94d92001

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 =