diff options
author | 2025-01-29 16:43:52 -0800 | |
---|---|---|
committer | 2025-01-29 16:43:52 -0800 | |
commit | e320fb7b6a3097564cc46052c3a43b71d44fe48a (patch) | |
tree | 51573ebd5dfadba1e87f02ef1a189f4f7f0a5295 | |
parent | 60274c5e3ea7e0ab060db396683620240c69af98 (diff) | |
parent | aca09734f6eb54fce85ac96aead88f9d80ba8cea (diff) |
Merge "Revise IntentRedirect Hardening debug logs." into main
-rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 4 | ||||
-rw-r--r-- | services/core/java/com/android/server/wm/ActivityStarter.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 0603c4506cd1..6ece2654f3bf 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -19397,13 +19397,13 @@ public class ActivityManagerService extends IActivityManager.Stub if (((intent.getExtendedFlags() & Intent.EXTENDED_FLAG_NESTED_INTENT_KEYS_COLLECTED) == 0) && intent.getExtras() != null && intent.getExtras().hasIntent()) { Slog.wtf(TAG, - "[IntentRedirect] The intent does not have its nested keys collected as a " + "[IntentRedirect Hardening] The intent does not have its nested keys collected as a " + "preparation for creating intent creator tokens. Intent: " + intent + "; creatorPackage: " + creatorPackage); if (preventIntentRedirectShowToastIfNestedKeysNotCollectedRW()) { UiThread.getHandler().post( () -> Toast.makeText(mContext, - "Nested keys not collected. go/report-bug-intentRedir to report a" + "Nested keys not collected, activity launch won't be blocked. go/report-bug-intentRedir to report a" + " bug", Toast.LENGTH_LONG).show()); } if (preventIntentRedirectThrowExceptionIfNestedKeysNotCollected()) { diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index c7d4467a6e98..6f76618b0029 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -3655,7 +3655,7 @@ class ActivityStarter { private static String getIntentRedirectPreventedLogMessage(@NonNull String message, @NonNull Intent intent, int intentCreatorUid, @Nullable String intentCreatorPackage, int callingUid, @Nullable String callingPackage) { - return "[IntentRedirect]" + message + " intentCreatorUid: " + intentCreatorUid + return "[IntentRedirect Hardening] " + message + " intentCreatorUid: " + intentCreatorUid + "; intentCreatorPackage: " + intentCreatorPackage + "; callingUid: " + callingUid + "; callingPackage: " + callingPackage + "; intent: " + intent; } |