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

Commit 6a8cc597 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Add null check in showLockTaskToast" into nyc-dev am: d7007923 

am: 1f1f29ec

* commit '1f1f29ec':
  Add null check in showLockTaskToast

Change-Id: I4398b476dfd86c807a452b09b789214b44e7ccdd
parents f94cd49a 1f1f29ec

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