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

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

Merge "Add additional info to log message." into main

parents 88163434 3e250ec9

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

+7 −3
Original line number Original line Diff line number Diff line
@@ -513,7 +513,9 @@ public class BackgroundActivityStartController { 
                == ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED) {

                == ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED) {

            // Both caller and real caller allow with system defined behavior

            // Both caller and real caller allow with system defined behavior

            Slog.wtf(TAG,

            Slog.wtf(TAG,

                    "With Android 15 BAL hardening this activity start would be blocked"

                    "With Android 15 BAL hardening this activity start may be blocked"

                            + " if the PI creator upgrades target_sdk to 35+"

                            + " AND the PI sender upgrades target_sdk to 34+! "

                            + " (missing opt in by PI creator)! "

                            + " (missing opt in by PI creator)! "

                            + state.dump(resultForCaller, resultForRealCaller));

                            + state.dump(resultForCaller, resultForRealCaller));

            showBalRiskToast("BAL would be blocked", state);

            showBalRiskToast("BAL would be blocked", state);
@@ -525,7 +527,8 @@ public class BackgroundActivityStartController { 
                == ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED) {

                == ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED) {

            // Allowed before V by creator

            // Allowed before V by creator

            Slog.wtf(TAG,

            Slog.wtf(TAG,

                    "With Android 15 BAL hardening this activity start would be blocked"

                    "With Android 15 BAL hardening this activity start may be blocked"

                            + " if the PI creator upgrades target_sdk to 35+! "

                            + " (missing opt in by PI creator)! "

                            + " (missing opt in by PI creator)! "

                            + state.dump(resultForCaller, resultForRealCaller));

                            + state.dump(resultForCaller, resultForRealCaller));

            showBalRiskToast("BAL would be blocked", state);

            showBalRiskToast("BAL would be blocked", state);
@@ -537,7 +540,8 @@ public class BackgroundActivityStartController { 
            // Allowed before U by sender

            // Allowed before U by sender

            if (state.mBalAllowedByPiSender.allowsBackgroundActivityStarts()) {

            if (state.mBalAllowedByPiSender.allowsBackgroundActivityStarts()) {

                Slog.wtf(TAG,

                Slog.wtf(TAG,

                        "With Android 14 BAL hardening this activity start would be blocked"

                        "With Android 14 BAL hardening this activity start will be blocked"

                                + " if the PI sender upgrades target_sdk to 34+! "

                                + " (missing opt in by PI sender)! "

                                + " (missing opt in by PI sender)! "

                                + state.dump(resultForCaller, resultForRealCaller));

                                + state.dump(resultForCaller, resultForRealCaller));

                showBalBlockedToast("BAL would be blocked", state);

                showBalBlockedToast("BAL would be blocked", state);