PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 7178253 from 5e57390696 to sc-v2-release

Browse Source 
Change-Id: I58e402b67ea0e8fb0bfc124e3cb681ad992c778b
This commit is contained in:
android-build-team Robot
2021-03-02 02:08:32 +00:00
parent 36db1ae407 5e57390696
commit ccb77ca28b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/network/telephony/Enable2gPreferenceController.java
View File

@@ -31,7 +31,8 @@ public class Enable2gPreferenceController extends TelephonyTogglePreferenceContr
private static final long BITMASK_2G = TelephonyManager.NETWORK_TYPE_BITMASK_GSM private static final long BITMASK_2G = TelephonyManager.NETWORK_TYPE_BITMASK_GSM
| TelephonyManager.NETWORK_TYPE_BITMASK_GPRS | TelephonyManager.NETWORK_TYPE_BITMASK_GPRS
| TelephonyManager.NETWORK_TYPE_BITMASK_EDGE | TelephonyManager.NETWORK_TYPE_BITMASK_EDGE
| TelephonyManager.NETWORK_TYPE_BITMASK_CDMA; | TelephonyManager.NETWORK_TYPE_BITMASK_CDMA
| TelephonyManager.NETWORK_TYPE_BITMASK_1xRTT;
private CarrierConfigManager mCarrierConfigManager; private CarrierConfigManager mCarrierConfigManager;
private TelephonyManager mTelephonyManager; private TelephonyManager mTelephonyManager;

5
src/com/android/settings/utils/AndroidKeystoreAliasLoader.java
View File

@@ -81,11 +81,10 @@ public class AndroidKeystoreAliasLoader {
return; return;
} }
while (aliases.hasMoreElements()) { while (aliases.hasMoreElements()) {
String alias = aliases.nextElement(); final String alias = aliases.nextElement();
try { try {
Key key = keyStore.getKey(alias, null); final Key key = keyStore.getKey(alias, null);
if (key != null) { if (key != null) {
if (key instanceof PrivateKey) { if (key instanceof PrivateKey) {
mKeyCertAliases.add(alias); mKeyCertAliases.add(alias);