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

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

Merge "Replace flags with check for debug build" into main

parents faaec19e 584d8893

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

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

}



flag {

    name: "bal_show_toasts_blocked"

    namespace: "responsible_apis"

    description: "Enable toasts to indicate actual BAL blocking."

    bug: "308059069"

}



flag {

    name: "bal_respect_app_switch_state_when_check_bound_by_foreground_uid"

    namespace: "responsible_apis"
@@ -61,13 +54,6 @@ flag { 
    bug: "322159724"

}



flag {

    name: "bal_additional_logging"

    namespace: "responsible_apis"

    description: "Enable additional logging."

    bug: "403398176"

}



flag {

    name: "bal_cover_intent_sender"

    namespace: "responsible_apis"

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

+3 −4
Original line number Diff line number Diff line
@@ -45,9 +45,7 @@ import static com.android.server.wm.ActivityTaskManagerService.APP_SWITCH_ALLOW; 
import static com.android.server.wm.ActivityTaskManagerService.APP_SWITCH_FG_ONLY;

import static com.android.server.wm.ActivityTaskSupervisor.getApplicationLabel;

import static com.android.server.wm.PendingRemoteAnimationRegistry.TIMEOUT_MS;

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

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

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



import static java.lang.annotation.RetentionPolicy.SOURCE;

import static java.util.Objects.requireNonNull;
@@ -67,6 +65,7 @@ import android.content.ComponentName; 
import android.content.Intent;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.os.Build;

import android.os.IBinder;

import android.os.Process;

import android.os.RemoteException;
@@ -978,7 +977,7 @@ public class BackgroundActivityStartController { 
    private BalVerdict abortLaunch(BalState state) {

        Slog.wtf(TAG, "Background activity launch blocked! goo.gle/android-bal "

                + state);

        if (balShowToastsBlocked()

        if (Build.IS_DEBUGGABLE

                && (state.mResultForCaller.allows() || state.mResultForRealCaller.allows())) {

            // only show a toast if either caller or real caller could launch if they opted in

            showToast("BAL blocked. goo.gle/android-bal");
@@ -2176,7 +2175,7 @@ public class BackgroundActivityStartController { 
                return false;

            } else {

                // log to determine grace period length distribution

                if (balAdditionalLogging()) {

                if (Build.IS_DEBUGGABLE) {

                    Slog.wtf(TAG, "Activity start ONLY allowed by " + balCodeToString(balCode) + " "

                            + finalVerdict.mMessage + ": " + state);

                }