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

Commit d1157282 authored by Yuri Lin's avatar Yuri Lin Committed by Automerger Merge Worker
Browse files

Merge "Update bug number on TODO for activity launch on occluded keyguard"... 

Merge "Update bug number on TODO for activity launch on occluded keyguard" into udc-qpr-dev am: abe70d8b am: c2f4c43e

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



Change-Id: I60adc39903ac2e6ac478c0318c1d83e4bc10acd6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2209f8ce c2f4c43e

packages/SystemUI/src/com/android/systemui/statusbar/phone/ActivityStarterImpl.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -401,7 +401,7 @@ constructor( 
        isActivityIntent: Boolean,

        isActivityIntent: Boolean,

        showOverLockscreen: Boolean,

        showOverLockscreen: Boolean,

    ): Boolean {

    ): Boolean {

        // TODO(b/184121838): Support launch animations when occluded.

        // TODO(b/294418322): Support launch animations when occluded.

        if (keyguardStateController.isOccluded) {

        if (keyguardStateController.isOccluded) {

            return false

            return false

        }

        }