From a0b51d69880d632698db1144d939f10a8160e2c1 Mon Sep 17 00:00:00 2001
From: Gil Cukierman <cukie@google.com>
Date: Mon, 25 Sep 2023 17:27:58 +0000
Subject: [PATCH] Add feature flag for removal of KEY_HIDE_ENABLE_2G

This flag will guard soft removal of the logic to honor
the CarrierConfigManager.KEY_HIDE_ENABLE_2G API.

Bug: 300248708
Test: m Settings
Change-Id: I6a0e94f7208a4f148a3758b327fcd4990175038b
---
 aconfig/Android.bp                                   | 1 +
 aconfig/settings_telephony_flag_declarations.aconfig | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 aconfig/settings_telephony_flag_declarations.aconfig

diff --git a/aconfig/Android.bp b/aconfig/Android.bp
index 7828e995840..538ae683c2e 100644
--- a/aconfig/Android.bp
+++ b/aconfig/Android.bp
@@ -10,6 +10,7 @@ aconfig_declarations {
         "settings_globalintl_flag_declarations.aconfig",
         "settings_apn_flag_declarations.aconfig",
         "settings_onboarding_experience_flag_declarations.aconfig",
+        "settings_telephony_flag_declarations.aconfig",
     ],
 }
 
diff --git a/aconfig/settings_telephony_flag_declarations.aconfig b/aconfig/settings_telephony_flag_declarations.aconfig
new file mode 100644
index 00000000000..68e313b4567
--- /dev/null
+++ b/aconfig/settings_telephony_flag_declarations.aconfig
@@ -0,0 +1,8 @@
+package: "com.android.settings.flags"
+
+flag {
+    name: "remove_key_hide_enable_2g"
+    namespace: "cellular_security"
+    description: "Stop honoring CarrierConfigManager.KEY_HIDE_ENABLE_2G. Allow 2G toggle cannot be hidden from users by carriers."
+    bug: "300248708"
+}