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

Commit 3a77e296 authored by Achim Thesmann's avatar Achim Thesmann
Browse files

Improve toast text. 

Instead of dumping too much information that the user cannot process in
the short time, just show a go link (go/debug-bal) with more information
what to look for.

Test: atest BackgroundActivityLaunchTest
Bug: 25198068
Change-Id: I46bf2cc702220f2d71440ee675471a87b6815742
parent 881ba193

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

+8 −12
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ public class BackgroundActivityStartController { 
                                + " if the PI creator upgrades target_sdk to 35+"

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

                                + state.dump(resultForCaller, resultForRealCaller));

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

                showBalRiskToast();

                // return the realCaller result for backwards compatibility

                return statsLog(resultForRealCaller, state);

            }
@@ -679,7 +679,7 @@ public class BackgroundActivityStartController { 
                                + " if the PI creator upgrades target_sdk to 35+! "

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

                                + state.dump(resultForCaller, resultForRealCaller));

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

                showBalRiskToast();

                return statsLog(resultForCaller, state);

            }

            Slog.wtf(TAG,
@@ -696,7 +696,7 @@ public class BackgroundActivityStartController { 
                                + " if the PI sender upgrades target_sdk to 34+! "

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

                                + state.dump(resultForCaller, resultForRealCaller));

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

                showBalRiskToast();

                return statsLog(resultForRealCaller, state);

            }

            Slog.wtf(TAG, "Without Android 14 BAL hardening this activity start would be allowed"
@@ -712,7 +712,7 @@ public class BackgroundActivityStartController { 
            BalVerdict resultForRealCaller) {

        Slog.w(TAG, "Background activity launch blocked! "

                + state.dump(resultForCaller, resultForRealCaller));

        showBalBlockedToast("BAL blocked", state);

        showBalBlockedToast();

        return statsLog(BalVerdict.BLOCK, state);

    }
@@ -1104,19 +1104,15 @@ public class BackgroundActivityStartController { 
        return true;

    }



    private void showBalBlockedToast(String toastText, BalState state) {

    private void showBalBlockedToast() {

        if (balShowToastsBlocked()) {

            showToast(toastText

                    + " caller:" + state.mCallingPackage

                    + " realCaller:" + state.mRealCallingPackage);

            showToast("BAL blocked. go/debug-bal");

        }

    }



    private void showBalRiskToast(String toastText, BalState state) {

    private void showBalRiskToast() {

        if (balShowToasts()) {

            showToast(toastText

                    + " caller:" + state.mCallingPackage

                    + " realCaller:" + state.mRealCallingPackage);

            showToast("BAL allowed in compat mode. go/debug-bal");

        }

    }