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

Commit 7a8b0617 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Check null taskInfo for occlude-by-dream" into udc-dev am: 7cfd239b 

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



Change-Id: Id8c657853ecc624da4c30da76c17222360b443ba
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dd8d1dc4 7cfd239b

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

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