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

Commit a94d6e28 authored by Chris Li's avatar Chris Li
Browse files

Cleanup fix_set_adjacent_task_fragments_with_params

Fix: 430245941
Test: cleanup flag
Flag: EXEMPT cleanup flag
Change-Id: Id100b85967b0dd1cffe7dc1dacef6be318decc4c
parent 958d7c4b
Loading
Loading
Loading
Loading
+0 −11
Original line number Diff line number Diff line
@@ -159,17 +159,6 @@ flag {
    }
}

flag {
    namespace: "windowing_sdk"
    name: "fix_set_adjacent_task_fragments_with_params"
    description: "Fix the params set through setAdjacentTaskFragments"
    bug: "418159069"
    is_fixed_read_only: true
    metadata {
        purpose: PURPOSE_BUGFIX
    }
}

flag {
    namespace: "windowing_sdk"
    name: "update_task_min_dimensions_with_root_activity"
+1 −3
Original line number Diff line number Diff line
@@ -1775,9 +1775,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
                    effects |= TRANSACT_EFFECTS_LIFECYCLE;
                }

                final Bundle bundle = Flags.fixSetAdjacentTaskFragmentsWithParams()
                        ? operation.getBundle()
                        : hop.getLaunchOptions();
                final Bundle bundle = operation.getBundle();
                final WindowContainerTransaction.TaskFragmentAdjacentParams adjacentParams =
                        bundle != null
                                ? new WindowContainerTransaction.TaskFragmentAdjacentParams(bundle)
+0 −4
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ import android.os.Binder;
import android.os.Bundle;
import android.os.IBinder;
import android.os.RemoteException;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.annotations.Presubmit;
import android.view.RemoteAnimationDefinition;
import android.view.SurfaceControl;
@@ -110,8 +109,6 @@ import android.window.WindowContainerTransaction;

import androidx.test.filters.SmallTest;

import com.android.window.flags.Flags;

import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -1951,7 +1948,6 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase {
                SecurityException.class);
    }

    @EnableFlags(Flags.FLAG_FIX_SET_ADJACENT_TASK_FRAGMENTS_WITH_PARAMS)
    @Test
    public void testApplyTransaction_setAdjacentTaskFragments_withParams() {
        final Task task = createTask(mDisplayContent);