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

Commit f7261c50 authored by Jiaming Liu's avatar Jiaming Liu
Browse files

Remove released system organizer flag 

Fix: 409608883
Flag: EXEMPT removing com.android.window.flags.task_fragment_system_organizer_flag
Test: atest WindowOrganizerTests TaskFragmentOrganizerControllerTest
Change-Id: I40e138ec5d49f0658f29cc5733ac6b1b81ef2823
parent 7218c196

core/java/android/window/TaskFragmentOrganizer.java

+0 −5
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import static android.view.WindowManager.TRANSIT_OPEN; 
import static android.window.ActivityWindowInfo.getActivityWindowInfo;



import android.annotation.CallSuper;

import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -37,8 +36,6 @@ import android.os.RemoteException; 
import android.view.RemoteAnimationDefinition;

import android.view.WindowManager;



import com.android.window.flags.Flags;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.Objects;
@@ -198,7 +195,6 @@ public class TaskFragmentOrganizer extends WindowOrganizer { 
     */

    @CallSuper

    @RequiresPermission(value = "android.permission.MANAGE_ACTIVITY_TASKS", conditional = true)

    @FlaggedApi(Flags.FLAG_TASK_FRAGMENT_SYSTEM_ORGANIZER_FLAG)

    public void registerOrganizer(boolean isSystemOrganizer) {

        registerOrganizer(isSystemOrganizer, null /* outSavedState */);

    }
@@ -361,7 +357,6 @@ public class TaskFragmentOrganizer extends WindowOrganizer { 
     *

     * @hide

     */

    @FlaggedApi(Flags.FLAG_TASK_FRAGMENT_SYSTEM_ORGANIZER_FLAG)

    public void applySystemTransaction(@NonNull WindowContainerTransaction wct,

            @TaskFragmentTransitionType int transitionType,

            @Nullable RemoteTransition remoteTransition) {

core/java/android/window/flags/windowing_sdk.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -5,13 +5,6 @@ 
package: "com.android.window.flags"

container: "system"



flag {

    namespace: "windowing_sdk"

    name: "task_fragment_system_organizer_flag"

    description: "Whether the TaskFragment system organizer feature is enabled"

    bug: "284050041"

}



flag {

    namespace: "windowing_sdk"

    name: "activity_embedding_interactive_divider_flag"

core/tests/coretests/src/android/window/flags/WindowFlagsTest.java

deleted100644 → 0
+0 −45
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.window.flags;



import static com.android.window.flags.Flags.taskFragmentSystemOrganizerFlag;



import android.platform.test.annotations.Presubmit;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;



import org.junit.Test;

import org.junit.runner.RunWith;



/**

 * Tests for {@link com.android.window.flags.Flags}

 *

 * Build/Install/Run:

 *  atest FrameworksCoreTests:WindowFlagsTest

 */

@RunWith(AndroidJUnit4.class)

@SmallTest

@Presubmit

public class WindowFlagsTest {



    @Test

    public void testTaskFragmentSystemOrganizerFlag() {

        // No crash when accessing the flag.

        taskFragmentSystemOrganizerFlag();

    }

}

services/core/java/com/android/server/wm/TaskFragmentOrganizerController.java

+1 −3
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ import android.window.WindowContainerTransaction; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.protolog.ProtoLog;

import com.android.internal.protolog.WmProtoLogGroups;

import com.android.window.flags.Flags;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;
@@ -540,8 +539,7 @@ public class TaskFragmentOrganizerController extends ITaskFragmentOrganizerContr 
    @Override

    public void registerOrganizer(@NonNull ITaskFragmentOrganizer organizer,

            boolean isSystemOrganizer, @NonNull Bundle outSavedState) {

        registerOrganizerInternal(organizer,

                Flags.taskFragmentSystemOrganizerFlag() && isSystemOrganizer, outSavedState);

        registerOrganizerInternal(organizer, isSystemOrganizer, outSavedState);

    }



    private void registerOrganizerInternal(

services/tests/wmtests/src/com/android/server/wm/TaskFragmentOrganizerControllerTest.java

+0 −15
Original line number Diff line number Diff line
@@ -109,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;
@@ -246,8 +244,6 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase { 


    @Test

    public void testOnTaskFragmentAppeared_systemOrganizer() {

        mSetFlagsRule.enableFlags(Flags.FLAG_TASK_FRAGMENT_SYSTEM_ORGANIZER_FLAG);



        mController.unregisterOrganizer(mIOrganizer);

        registerTaskFragmentOrganizer(mIOrganizer, true /* isSystemOrganizer */);
@@ -606,8 +602,6 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase { 


    @Test

    public void testApplyTransaction_allowRemoteTransitionForSystemOrganizer() {

        mSetFlagsRule.enableFlags(Flags.FLAG_TASK_FRAGMENT_SYSTEM_ORGANIZER_FLAG);



        mController.unregisterOrganizer(mIOrganizer);

        registerTaskFragmentOrganizer(mIOrganizer, true /* isSystemOrganizer */);
@@ -1017,7 +1011,6 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase { 


    @Test

    public void testApplyTransaction_createTaskFragment_overrideOrientation_systemOrganizer() {

        mSetFlagsRule.enableFlags(Flags.FLAG_TASK_FRAGMENT_SYSTEM_ORGANIZER_FLAG);

        mController.unregisterOrganizer(mIOrganizer);

        registerTaskFragmentOrganizer(mIOrganizer, true /* isSystemOrganizer */);
@@ -1801,8 +1794,6 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase { 


    @Test

    public void testApplyTransaction_reorderToBottomOfTask() {

        mSetFlagsRule.enableFlags(Flags.FLAG_TASK_FRAGMENT_SYSTEM_ORGANIZER_FLAG);



        mController.unregisterOrganizer(mIOrganizer);

        registerTaskFragmentOrganizer(mIOrganizer, true /* isSystemOrganizer */);

        final Task task = createTask(mDisplayContent);
@@ -1838,8 +1829,6 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase { 


    @Test

    public void testApplyTransaction_reorderToTopOfTask() {

        mSetFlagsRule.enableFlags(Flags.FLAG_TASK_FRAGMENT_SYSTEM_ORGANIZER_FLAG);



        mController.unregisterOrganizer(mIOrganizer);

        registerTaskFragmentOrganizer(mIOrganizer, true /* isSystemOrganizer */);

        final Task task = createTask(mDisplayContent);
@@ -1875,8 +1864,6 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase { 


    @Test

    public void testApplyTransaction_createTaskFragmentDecorSurface() {

        mSetFlagsRule.enableFlags(Flags.FLAG_TASK_FRAGMENT_SYSTEM_ORGANIZER_FLAG);



        final Task task = createTask(mDisplayContent);

        final TaskFragment tf = createTaskFragment(task);

        final TaskFragmentOperation operation = new TaskFragmentOperation.Builder(
@@ -1890,8 +1877,6 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase { 


    @Test

    public void testApplyTransaction_removeTaskFragmentDecorSurface() {

        mSetFlagsRule.enableFlags(Flags.FLAG_TASK_FRAGMENT_SYSTEM_ORGANIZER_FLAG);



        final Task task = createTask(mDisplayContent);

        final TaskFragment tf = createTaskFragment(task);