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

Commit 64d3e62c authored by Sergei Vasilinetc's avatar Sergei Vasilinetc Committed by android-build-merger
Browse files

Merge "HWUI: do nothing in case of empty layer" into nyc-dev am: 21a608f2 

am: 561df62a

* commit '561df62a':
  Add null check in showLockTaskToast

Change-Id: I5d7b851dbee2de45e9f0b184e3f5eb1722707946
parents f94cd49a 561df62a

services/core/java/com/android/server/am/ActivityStackSupervisor.java

+3 −1
Original line number Diff line number Diff line
@@ -3525,8 +3525,10 @@ public final class ActivityStackSupervisor implements DisplayListener { 
    }



    void showLockTaskToast() {

        if (mLockTaskNotify != null) {

            mLockTaskNotify.showToast(mLockTaskModeState);

        }

    }



    void showLockTaskEscapeMessageLocked(TaskRecord task) {

        if (mLockTaskModeTasks.contains(task)) {