Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "initialized carrier_certificate_string_array to an empty array instead of null, so that when a certificate is removed, it is also removed in SubscriptionInfoUpdater#updateSubscriptionByCarrierConfig" am: 12231e3a46 am: fc5c95c7db am: 1218bbd843

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469714

Change-Id: I53d3cea2ff838ba2fdbd0deb8ee8e39ac97a09e6
This commit is contained in:
Nazanin Bakhshi
2020-10-22 07:55:19 +00:00
committed by Automerger Merge Worker
parent 291d12965e 1218bbd843
commit 3798b435ed
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -4474,7 +4474,7 @@ public class CarrierConfigManager {
});
sDefaults.putBoolean(KEY_SUPPORT_WPS_OVER_IMS_BOOL, true);
sDefaults.putAll(Ims.getDefaults());
sDefaults.putStringArray(KEY_CARRIER_CERTIFICATE_STRING_ARRAY, null);
sDefaults.putStringArray(KEY_CARRIER_CERTIFICATE_STRING_ARRAY, new String[0]);
sDefaults.putBoolean(KEY_FORMAT_INCOMING_NUMBER_TO_NATIONAL_FOR_JP_BOOL, false);
sDefaults.putIntArray(KEY_DISCONNECT_CAUSE_PLAY_BUSYTONE_INT_ARRAY,
new int[] {4 /* BUSY */});