From e2bfcf88b771aeed4b0dfc7dc4b8e2c8f99ccb19 Mon Sep 17 00:00:00 2001 From: Janis Danisevskis Date: Fri, 26 Feb 2021 08:08:11 -0800 Subject: [PATCH 1/2] Address nits from ag/13702356 Test: N/A Bug: 171305607 Bug: 171305388 Change-Id: I044beb29ad84b1b016075997979766035e8be49d --- .../android/settings/utils/AndroidKeystoreAliasLoader.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/utils/AndroidKeystoreAliasLoader.java b/src/com/android/settings/utils/AndroidKeystoreAliasLoader.java index a4af7aa29eb..9c45ef40bca 100644 --- a/src/com/android/settings/utils/AndroidKeystoreAliasLoader.java +++ b/src/com/android/settings/utils/AndroidKeystoreAliasLoader.java @@ -81,11 +81,10 @@ public class AndroidKeystoreAliasLoader { return; } - while (aliases.hasMoreElements()) { - String alias = aliases.nextElement(); + final String alias = aliases.nextElement(); try { - Key key = keyStore.getKey(alias, null); + final Key key = keyStore.getKey(alias, null); if (key != null) { if (key instanceof PrivateKey) { mKeyCertAliases.add(alias); From 7c7977efae5b6cba66dc1134968111fd7838da62 Mon Sep 17 00:00:00 2001 From: Yomna Nasser Date: Sat, 27 Feb 2021 00:11:01 +0000 Subject: [PATCH 2/2] 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;