Merge "Avoid calling IPC with a lock" into main

1 files changed, 10 insertions, 0 deletions

diff --git a/location/java/android/location/flags/location.aconfig b/location/java/android/location/flags/location.aconfig
index 9cc58ae35692..4b460c6ab039 100644
--- a/location/java/android/location/flags/location.aconfig
+++ b/location/java/android/location/flags/location.aconfig
@@ -199,6 +199,16 @@ flag {
 }
 
 flag {
+    name: "fix_is_in_emergency_anr"
+    namespace: "location"
+    description: "Avoid calling IPC with a lock to avoid deadlock"
+    bug: "355384257"
+    metadata {
+        purpose: PURPOSE_BUGFIX
+    }
+}
+
+flag {
     name: "gnss_assistance_interface_jni"
     namespace: "location"
     description: "Flag for GNSS assistance interface JNI"