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

Commit 8e500bad authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove bal_require_opt_in_by_pending_intent_creator" into main

parents b756f3e0 c66d7f34

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

+0 −7
Original line number Diff line number Diff line 
package: "com.android.window.flags"

container: "system"



flag {

    name: "bal_require_opt_in_by_pending_intent_creator"

    namespace: "responsible_apis"

    description: "Require the PendingIntent creator to opt in starting with Android 15"

    bug: "296478951"

}



flag {

    name: "bal_dont_bring_existing_background_task_stack_to_fg"

    namespace: "responsible_apis"

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

+0 −3
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ import static com.android.server.wm.PendingRemoteAnimationRegistry.TIMEOUT_MS; 
import static com.android.window.flags.Flags.balAdditionalLogging;

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

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

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

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

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

import static com.android.window.flags.Flags.balStrictModeRo;
@@ -618,8 +617,6 @@ public class BackgroundActivityStartController { 
                        mCheckedOptions.getPendingIntentBackgroundActivityStartMode()));

            }

            // features

            sb.append("; balRequireOptInByPendingIntentCreator: ")

                    .append(balRequireOptInByPendingIntentCreator());

            sb.append("; balDontBringExistingBackgroundTaskStackToFg: ")

                    .append(balDontBringExistingBackgroundTaskStackToFg());

            sb.append("]");

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

+0 −2
Original line number Diff line number Diff line
@@ -562,7 +562,6 @@ public class BackgroundActivityStartControllerTests { 
                        + "realCallerApp: null; "

                        + "balAllowedByPiSender: BSP.ALLOW_BAL; "

                        + "realCallerStartMode: MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED; "

                        + "balRequireOptInByPendingIntentCreator: true; "

                        + "balDontBringExistingBackgroundTaskStackToFg: true]");

    }
@@ -664,7 +663,6 @@ public class BackgroundActivityStartControllerTests { 
                        + "realCallerApp: null; "

                        + "balAllowedByPiSender: BSP.ALLOW_FGS; "

                        + "realCallerStartMode: MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED; "

                        + "balRequireOptInByPendingIntentCreator: true; "

                        + "balDontBringExistingBackgroundTaskStackToFg: true]");

    }

}