commit 0c3a6b7ce9002d2c303bb8ae7d8609e74400503d
author Nazanin <nazaninb@google.com> Tue Aug 18 14:45:22 2020 -0700
committer Nazanin Bakhshi <nazaninb@google.com> Thu Oct 22 21:37:47 2020 +0000
tree 591659eda3f06456666347e41d7db73717c679ff
parent 85cb19429e33becb84832e57a06c0b9c4bf3c7a5

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
Merged-In: I921007498f42119581f565fcc6625c1275c59df8

telephony/java/android/telephony/CarrierConfigManager.java

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 74d7f52..93cd991 100755
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -4420,7 +4420,7 @@
                 });
         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.putIntArray(KEY_DISCONNECT_CAUSE_PLAY_BUSYTONE_INT_ARRAY,
                 new int[] {4 /* BUSY */});
         sDefaults.putBoolean(KEY_PREVENT_CLIR_ACTIVATION_AND_DEACTIVATION_CODE_BOOL, false);