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

Commit 37a55752 authored by Charles Chen's avatar Charles Chen
Browse files

Fix NPE when attach thumbnail 

Test: presubmit
Fixes: 376368044
Flag: EXEMPT bugfix
Change-Id: I501b99adb73b84364fecd456efc9f090ec211a56
parent 17b0cb78

libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java

+4 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import android.window.WindowContainerToken; 
import android.window.WindowContainerTransaction;



import com.android.internal.protolog.ProtoLog;

import com.android.window.flags.Flags;

import com.android.wm.shell.ShellTaskOrganizer;

import com.android.wm.shell.activityembedding.ActivityEmbeddingController;

import com.android.wm.shell.common.split.SplitScreenUtils;
@@ -419,7 +420,9 @@ public class DefaultMixedHandler implements MixedTransitionHandler, 
        for (int i = 0; i < info.getRootCount(); ++i) {

            out.addRoot(info.getRoot(i));

        }

        if (!Flags.moveAnimationOptionsToChange()) {

            out.setAnimationOptions(info.getAnimationOptions());

        }

        return out;

    }

libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java

+1 −2
Original line number Diff line number Diff line
@@ -566,8 +566,7 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { 
                    options = change.getAnimationOptions();

                }

                if (options != null) {

                    attachThumbnail(animations, onAnimFinish, change, info.getAnimationOptions(),

                            cornerRadius);

                    attachThumbnail(animations, onAnimFinish, change, options, cornerRadius);

                }

            }

        }