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

Commit 98919c5c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add null check in transientlaunchrestoretarget" into tm-dev am: f149b8bb 

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

Change-Id: Ie265bf008e79f20475ab2420eb3534bc2e791f76
parents 3654b0a0 f149b8bb

services/core/java/com/android/server/wm/Transition.java

+1 −0
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe 
    }



    Task getTransientLaunchRestoreTarget(@NonNull WindowContainer container) {

        if (mTransientLaunches == null) return null;

        for (int i = 0; i < mTransientLaunches.size(); ++i) {

            if (mTransientLaunches.keyAt(i).isDescendantOf(container)) {

                return mTransientLaunches.valueAt(i);