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

Commit d73e3332 authored by Achim Thesmann's avatar Achim Thesmann Committed by Android (Google) Code Review
Browse files

Merge "Remove bal_require_opt_in_same_uid flag" into main

parents 94fa3a4d 06fdce08

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

+0 −7
Original line number Diff line number Diff line
@@ -8,13 +8,6 @@ flag { 
    bug: "296478951"

}



flag {

    name: "bal_require_opt_in_same_uid"

    namespace: "responsible_apis"

    description: "Require the PendingIntent creator/sender to opt in if it is the same UID"

    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

+1 −3
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ import static com.android.window.flags.Flags.balDontBringExistingBackgroundTaskS 
import static com.android.window.flags.Flags.balImproveRealCallerVisibilityCheck;

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

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

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

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

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

import static com.android.window.flags.Flags.balStrictModeRo;
@@ -359,7 +358,7 @@ public class BackgroundActivityStartController { 
            } else if (mIsCallForResult) {

                mAutoOptInReason = AUTO_OPT_IN_CALL_FOR_RESULT;

                mAutoOptInCaller = false;

            } else if (callingUid == realCallingUid && !balRequireOptInSameUid()) {

            } else if (callingUid == realCallingUid) {

                mAutoOptInReason = AUTO_OPT_IN_SAME_UID;

                mAutoOptInCaller = false;

            } else if (realCallerBackgroundActivityStartMode
@@ -604,7 +603,6 @@ public class BackgroundActivityStartController { 
                    .append(balImproveRealCallerVisibilityCheck());

            sb.append("; balRequireOptInByPendingIntentCreator: ")

                    .append(balRequireOptInByPendingIntentCreator());

            sb.append("; balRequireOptInSameUid: ").append(balRequireOptInSameUid());

            sb.append("; balRespectAppSwitchStateWhenCheckBoundByForegroundUid: ")

                    .append(balRespectAppSwitchStateWhenCheckBoundByForegroundUid());

            sb.append("; balDontBringExistingBackgroundTaskStackToFg: ")