commit cacafcbb9709523c0ecb39c0984f3e247a1450d7
author joonhunshin <joonhunshin@google.com> Fri Jun 21 06:11:25 2024 +0000
committer Joonhun Shin <joonhunshin@google.com> Fri Jun 21 08:01:52 2024 +0000
tree 97ebf96ce3e33b847e98f24191e28efdb32ae915
parent caace3411fe28b43a6ca162f91eb9bc26c83eb60

Add feature flag to prevent hangup during call merge

Bug: 317070933
Flag:  com.android.internal.telephony.flags.prevent_hangup_during_call_merge
Test: build pass
Change-Id: I543982ce2eff45b5c45858cdc5c4d50fd81b8952

flags/ims.aconfig

diff --git a/flags/ims.aconfig b/flags/ims.aconfig
index 4eff505..1056ea3 100644
--- a/flags/ims.aconfig
+++ b/flags/ims.aconfig
@@ -115,3 +115,14 @@
         purpose: PURPOSE_BUGFIX
     }
 }
+
+# OWNER=joonhunshin TARGET=24Q4
+flag {
+    name: "prevent_hangup_during_call_merge"
+    namespace: "telephony"
+    description: "This flag prevents hangup call during call merge"
+    bug:"317070933"
+    metadata {
+        purpose: PURPOSE_BUGFIX
+    }
+}