diff options
| -rw-r--r-- | core/java/android/security/responsible_apis_flags.aconfig | 7 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/core/java/android/security/responsible_apis_flags.aconfig b/core/java/android/security/responsible_apis_flags.aconfig index 2007a5f43f41..6228bc98b3c2 100644 --- a/core/java/android/security/responsible_apis_flags.aconfig +++ b/core/java/android/security/responsible_apis_flags.aconfig @@ -104,6 +104,13 @@ flag { } flag { + name: "prevent_intent_redirect_show_toast_if_nested_keys_not_collected_r_w" + namespace: "responsible_apis" + description: "Prevent intent redirect attacks by showing a toast if not yet collected" + bug: "361143368" +} + +flag { name: "prevent_intent_redirect_throw_exception_if_nested_keys_not_collected" namespace: "responsible_apis" description: "Prevent intent redirect attacks by throwing exception if the intent does not collect nested keys" diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 78dee3169161..cf34fe489a1e 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -132,7 +132,7 @@ import static android.provider.Settings.Global.DEBUG_APP; import static android.provider.Settings.Global.WAIT_FOR_DEBUGGER; import static android.security.Flags.preventIntentRedirect; import static android.security.Flags.preventIntentRedirectCollectNestedKeysOnServerIfNotCollected; -import static android.security.Flags.preventIntentRedirectShowToastIfNestedKeysNotCollected; +import static android.security.Flags.preventIntentRedirectShowToastIfNestedKeysNotCollectedRW; import static android.security.Flags.preventIntentRedirectThrowExceptionIfNestedKeysNotCollected; import static android.util.FeatureFlagUtils.SETTINGS_ENABLE_MONITOR_PHANTOM_PROCS; import static android.view.Display.INVALID_DISPLAY; @@ -19336,7 +19336,7 @@ public class ActivityManagerService extends IActivityManager.Stub "[IntentRedirect] The intent does not have its nested keys collected as a " + "preparation for creating intent creator tokens. Intent: " + intent + "; creatorPackage: " + creatorPackage); - if (preventIntentRedirectShowToastIfNestedKeysNotCollected()) { + if (preventIntentRedirectShowToastIfNestedKeysNotCollectedRW()) { UiThread.getHandler().post( () -> Toast.makeText(mContext, "Nested keys not collected. go/report-bug-intentRedir to report a" |