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

Commit 911ebe09 authored by Charles Chen's avatar Charles Chen Committed by Android (Google) Code Review
Browse files

Merge "Revert "Fix NPE when attach thumbnail"" into main

parents 0aee75d3 84de708b

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

+1 −4
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 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;
@@ -420,9 +419,7 @@ 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

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

                }

                if (options != null) {

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

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

                            cornerRadius);

                }

            }

        }