commit 7c7977efae5b6cba66dc1134968111fd7838da62
author Yomna Nasser <yomna@google.com> Sat Feb 27 00:11:01 2021 +0000
committer Yomna Nasser <yomna@google.com> Sat Feb 27 00:11:01 2021 +0000
tree 6765cf02d4426a8d51fb898ef73727e209da85b6
parent 8caf56ee46d9eb6c3acadde29d700efa86051d4e

Include 1xRTT when updating set of RATs via "Allow 2G" toggle.

Update BITMASK_2G to include 1xRTT when disabling/enabling 2G
via toggle in Enable2gPreferenceController. This is to align
with TelephonyManager's NETWORK_CLASS_BITMASK_2G.

Bug: b/163168917
Test: m & atest -c Enable2gPreferenceControllerTest
Change-Id: Ia0e099b63a9089be8cd8bfd4211db9eb3c506fc3

src/com/android/settings/network/telephony/Enable2gPreferenceController.java

diff --git a/src/com/android/settings/network/telephony/Enable2gPreferenceController.java b/src/com/android/settings/network/telephony/Enable2gPreferenceController.java
index 1fa4300..c780234 100644
--- a/src/com/android/settings/network/telephony/Enable2gPreferenceController.java
+++ b/src/com/android/settings/network/telephony/Enable2gPreferenceController.java
@@ -31,7 +31,8 @@
     private static final long BITMASK_2G =  TelephonyManager.NETWORK_TYPE_BITMASK_GSM
                 | TelephonyManager.NETWORK_TYPE_BITMASK_GPRS
                 | TelephonyManager.NETWORK_TYPE_BITMASK_EDGE
-                | TelephonyManager.NETWORK_TYPE_BITMASK_CDMA;
+                | TelephonyManager.NETWORK_TYPE_BITMASK_CDMA
+                | TelephonyManager.NETWORK_TYPE_BITMASK_1xRTT;
 
     private CarrierConfigManager mCarrierConfigManager;
     private TelephonyManager mTelephonyManager;