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

Commit 0abc592f authored by Massimo Carli's avatar Massimo Carli Committed by Android (Google) Code Review
Browse files

Merge "[1/n] AppBounds should be nullable in WindowContainerTransition" into main

parents 7d509b24 a235d7f7

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4614,7 +4614,7 @@ package android.window { 
    method @NonNull public android.window.WindowContainerTransaction setActivityWindowingMode(@NonNull android.window.WindowContainerToken, int);

    method @NonNull public android.window.WindowContainerTransaction setAdjacentRoots(@NonNull android.window.WindowContainerToken...);

    method @NonNull public android.window.WindowContainerTransaction setAdjacentTaskFragments(@NonNull android.os.IBinder, @NonNull android.os.IBinder, @Nullable android.window.WindowContainerTransaction.TaskFragmentAdjacentParams);

    method @NonNull public android.window.WindowContainerTransaction setAppBounds(@NonNull android.window.WindowContainerToken, @NonNull android.graphics.Rect);

    method @NonNull public android.window.WindowContainerTransaction setAppBounds(@NonNull android.window.WindowContainerToken, @Nullable android.graphics.Rect);

    method @NonNull public android.window.WindowContainerTransaction setBounds(@NonNull android.window.WindowContainerToken, @NonNull android.graphics.Rect);

    method @NonNull public android.window.WindowContainerTransaction setBoundsChangeTransaction(@NonNull android.window.WindowContainerToken, @NonNull android.view.SurfaceControl.Transaction);

    method @NonNull public android.window.WindowContainerTransaction setErrorCallbackToken(@NonNull android.os.IBinder);

core/java/android/window/WindowContainerTransaction.java

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ public final class WindowContainerTransaction implements Parcelable { 
     */

    @NonNull

    public WindowContainerTransaction setAppBounds(

            @NonNull WindowContainerToken container, @NonNull Rect appBounds) {

            @NonNull WindowContainerToken container, @Nullable Rect appBounds) {

        final Change chg = getOrCreateChange(container.asBinder());

        chg.mConfiguration.windowConfiguration.setAppBounds(appBounds);

        chg.mConfigSetMask |= ActivityInfo.CONFIG_WINDOW_CONFIGURATION;