From 7c7977efae5b6cba66dc1134968111fd7838da62 Mon Sep 17 00:00:00 2001
From: Yomna Nasser <yomna@google.com>
Date: Sat, 27 Feb 2021 00:11:01 +0000
Subject: [PATCH] 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
---
 .../network/telephony/Enable2gPreferenceController.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/network/telephony/Enable2gPreferenceController.java b/src/com/android/settings/network/telephony/Enable2gPreferenceController.java
index 1fa430004b3..c7802341ce0 100644
--- a/src/com/android/settings/network/telephony/Enable2gPreferenceController.java
+++ b/src/com/android/settings/network/telephony/Enable2gPreferenceController.java
@@ -31,7 +31,8 @@ public class Enable2gPreferenceController extends TelephonyTogglePreferenceContr
     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;