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

Commit 7cfd239b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Check null taskInfo for occlude-by-dream" into udc-dev

parents 83847ed4 f293a972

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) {