summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Achim Thesmann <achim@google.com> 2023-12-19 23:51:18 +0000
committer Achim Thesmann <achim@google.com> 2023-12-20 07:11:03 +0000
commit3a77e296be2674cf534f36110ff3da8199abcea4 (patch)
treefe01eae1110973e3535f0294bdaeafb30994f01f
parent881ba1931c4043fcdee235f27e39c687076d1a85 (diff)
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
-rw-r--r--services/core/java/com/android/server/wm/BackgroundActivityStartController.java20
1 files changed, 8 insertions, 12 deletions
diff --git a/services/core/java/com/android/server/wm/BackgroundActivityStartController.java b/services/core/java/com/android/server/wm/BackgroundActivityStartController.java
index 4929df8061b2..24c953b127bc 100644
--- a/services/core/java/com/android/server/wm/BackgroundActivityStartController.java
+++ b/services/core/java/com/android/server/wm/BackgroundActivityStartController.java
@@ -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");
}
}