diff options
| author | 2020-08-18 14:45:22 -0700 | |
|---|---|---|
| committer | 2020-08-18 14:45:22 -0700 | |
| commit | d18cde663e5bbbc7675240b3582e2f44a285708f (patch) | |
| tree | 9a9a5c58139ff2238fdbaa41b73fb70a2bc4be5f | |
| parent | df80878c8e3976dc198bdd21efc05ce09b9fe24b (diff) | |
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
Bug: 162700101
Test: manual
Change-Id: I921007498f42119581f565fcc6625c1275c59df8
| -rwxr-xr-x | telephony/java/android/telephony/CarrierConfigManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index fa229fb47423..a229efbe9970 100755 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -4406,7 +4406,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 */}); |