commit 761fd612c4f5c0a5c8b95de4030ecd0e854e0fed
author Gil Cukierman <cukie@google.com> Mon Oct 02 20:45:50 2023 +0000
committer Gil Cukierman <cukie@google.com> Wed Oct 04 13:59:55 2023 +0000
tree 5a02c23394226e3c0a22f5eb2520454e1f0ea352
parent a0b51d69880d632698db1144d939f10a8160e2c1

Stop honoring CarrierConfigManager.KEY_HIDE_ENABLE_2G

KEY_HIDE_ENABLE_2G is soft removed in Android API level 35
because it hides a security feature. This patch
introduces simplified logic that ignores the
carrier config value. The new behavior is behind a feature flag.

This patch also includes some cleanup.
1. It removes an unneeded check for null carrier config
2. It removes test logic that set the value of KEY_HIDE_ENABLE_2G
   in places where it had no impact on the test.

Bug: 300248708
Test: atest Enable2gPreferenceControllerTest
Change-Id: I892d115d1ae173d2f3cd69e8f8b97bc5bfa7c67b

tests/unit/Android.bp

diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index eb38980..1b14a73 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -18,6 +18,7 @@
     ],
 
     static_libs: [
+        "aconfig_settings_flags_lib",
         "androidx.arch.core_core-testing",
         "androidx.test.core",
         "androidx.test.rules",