Merge "Remove use_permission_manager_for_broadcast_delivery_check flag" into main
diff --git a/services/core/java/com/android/server/am/flags.aconfig b/services/core/java/com/android/server/am/flags.aconfig
index 5d5b35b..8395685 100644
--- a/services/core/java/com/android/server/am/flags.aconfig
+++ b/services/core/java/com/android/server/am/flags.aconfig
@@ -90,14 +90,6 @@
flag {
namespace: "backstage_power"
- name: "use_permission_manager_for_broadcast_delivery_check"
- description: "Use PermissionManager API for broadcast delivery permission checks."
- bug: "315468967"
- is_fixed_read_only: true
-}
-
-flag {
- namespace: "backstage_power"
name: "trace_receiver_registration"
description: "Add tracing for broadcast receiver registration and un-registration"
bug: "336385821"