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

Commit 84de708b authored Oct 30, 2024 by Charles Chen

Revert "Fix NPE when attach thumbnail"

This reverts commit 37a55752.

Reason for revert: There's one missing part not catch
The below condition should be flipped:
```
if (Flags.moveAnimationOptionsToChange()) {
    options = info.getAnimationOptions();
} else {
    options = change.getAnimationOptions();
}
```

Change-Id: I6e65184a8dce0fb573697d92071aba3a49ab2ac9

parent 37a55752

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);
		}
		}
		}