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

Commit c0e54298 authored by Louis Chang's avatar Louis Chang
Browse files

Remove fix_pip_restore_to_overlay flag 

Bug: 297887697
Test: wm presubmit
Flag: EXEMPT remove fix_pip_restore_to_overlay flag
Change-Id: I8c8ba7af10bc3946d2e3b5bf5cc17f9bc8d5143f
parent aa86e4a7

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

+0 −10
Original line number Diff line number Diff line
@@ -66,16 +66,6 @@ flag { 
    is_fixed_read_only: true

}



flag {

    namespace: "windowing_sdk"

    name: "fix_pip_restore_to_overlay"

    description: "Restore exit-pip activity back to ActivityEmbedding overlay"

    bug: "297887697"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    namespace: "windowing_sdk"

    name: "activity_embedding_animation_customization_flag"

libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java

+2 −10
Original line number Diff line number Diff line
@@ -695,12 +695,8 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
                        break;

                    case TYPE_ACTIVITY_REPARENTED_TO_TASK:

                        final IBinder candidateAssociatedActToken, lastOverlayToken;

                        if (Flags.fixPipRestoreToOverlay()) {

                        candidateAssociatedActToken = change.getOtherActivityToken();

                        lastOverlayToken = change.getTaskFragmentToken();

                        } else {

                            candidateAssociatedActToken = lastOverlayToken = null;

                        }

                        onActivityReparentedToTask(

                                wct,

                                taskId,
@@ -1023,10 +1019,6 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
    @Nullable

    OverlayContainerRestoreParams getOverlayContainerRestoreParams(

            @Nullable IBinder associatedActivityToken, @Nullable IBinder overlayToken) {

        if (!Flags.fixPipRestoreToOverlay()) {

            return null;

        }



        if (associatedActivityToken == null || overlayToken == null) {

            return null;

        }

libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentContainer.java

+1 −2
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import androidx.annotation.NonNull; 
import androidx.annotation.Nullable;



import com.android.internal.annotations.VisibleForTesting;

import com.android.window.flags.Flags;



import java.util.ArrayList;

import java.util.Collections;
@@ -257,7 +256,7 @@ class TaskFragmentContainer { 
        mPendingAppearedIntent = pendingAppearedIntent;



        // Save the information necessary for restoring the overlay when needed.

        if (Flags.fixPipRestoreToOverlay() && overlayTag != null && pendingAppearedIntent != null

        if (overlayTag != null && pendingAppearedIntent != null

                && associatedActivity != null && !associatedActivity.isFinishing()) {

            final IBinder associatedActivityToken = associatedActivity.getActivityToken();

            final OverlayContainerRestoreParams params = new OverlayContainerRestoreParams(mToken,

libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/OverlayPresentationTest.java

+0 −2
Original line number Diff line number Diff line
@@ -874,8 +874,6 @@ public class OverlayPresentationTest { 


    @Test

    public void testOnActivityReparentedToTask_overlayRestoration() {

        mSetFlagRule.enableFlags(Flags.FLAG_FIX_PIP_RESTORE_TO_OVERLAY);



        // Prepares and mock the data necessary for the test.

        final IBinder activityToken = mActivity.getActivityToken();

        final Intent intent = new Intent();

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

+1 −2
Original line number Diff line number Diff line
@@ -407,8 +407,7 @@ public class TaskFragmentOrganizerController extends ITaskFragmentOrganizerContr 
                change.setTaskFragmentToken(lastParentTfToken);

            }

            // Only pass the activity token to the client if it belongs to the same process.

            if (Flags.fixPipRestoreToOverlay() && nextFillTaskActivity != null

                    && nextFillTaskActivity.getPid() == mOrganizerPid) {

            if (nextFillTaskActivity != null && nextFillTaskActivity.getPid() == mOrganizerPid) {

                change.setOtherActivityToken(nextFillTaskActivity.token);

            }

            return change;