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

Commit 34ee2cd8 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... 

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

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



Change-Id: I051250ced11c8b10aa6d871409cae7b8ba9650ee
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 89f71676 c086d595

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

+2 −2
Original line number Original line 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

            return apps.length == 0 ? TRANSIT_OLD_KEYGUARD_GOING_AWAY_ON_WALLPAPER

                    : TRANSIT_OLD_KEYGUARD_GOING_AWAY;

                    : TRANSIT_OLD_KEYGUARD_GOING_AWAY;

        } else if (type == TRANSIT_KEYGUARD_OCCLUDE) {

        } else if (type == TRANSIT_KEYGUARD_OCCLUDE) {

            boolean isOccludeByDream = apps.length > 0 && apps[0].taskInfo.topActivityType

            boolean isOccludeByDream = apps.length > 0 && apps[0].taskInfo != null

                    == WindowConfiguration.ACTIVITY_TYPE_DREAM;

                    && apps[0].taskInfo.topActivityType == WindowConfiguration.ACTIVITY_TYPE_DREAM;

            if (isOccludeByDream) return TRANSIT_OLD_KEYGUARD_OCCLUDE_BY_DREAM;

            if (isOccludeByDream) return TRANSIT_OLD_KEYGUARD_OCCLUDE_BY_DREAM;

            return TRANSIT_OLD_KEYGUARD_OCCLUDE;

            return TRANSIT_OLD_KEYGUARD_OCCLUDE;

        } else if (type == TRANSIT_KEYGUARD_UNOCCLUDE) {

        } else if (type == TRANSIT_KEYGUARD_UNOCCLUDE) {