Merge "Send opp uri information to device picker and nearby component" into main

1 files changed, 17 insertions, 0 deletions

diff --git a/flags/opp.aconfig b/flags/opp.aconfig
index 73604961fe..6d1a13bf21 100644
--- a/flags/opp.aconfig
+++ b/flags/opp.aconfig
@@ -41,3 +41,20 @@ flag {
     }
 }
 
+flag {
+    name: "opp_device_picker_extra_intent_apis"
+    is_exported: true
+    namespace: "bluetooth"
+    description: "New API to get the original intent in Bluetooth Device Picker"
+    bug: "395796600"
+}
+
+flag {
+    name: "send_opp_device_picker_extra_intent"
+    namespace: "bluetooth"
+    description: "Send the original intent when opening Bluetooth device picker"
+    bug: "397852103"
+    metadata {
+        purpose: PURPOSE_BUGFIX
+    }
+}