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
This commit is contained in:
@@ -4464,7 +4464,7 @@ public class CarrierConfigManager {
|
|||||||
});
|
});
|
||||||
sDefaults.putBoolean(KEY_SUPPORT_WPS_OVER_IMS_BOOL, true);
|
sDefaults.putBoolean(KEY_SUPPORT_WPS_OVER_IMS_BOOL, true);
|
||||||
sDefaults.putAll(Ims.getDefaults());
|
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.putBoolean(KEY_FORMAT_INCOMING_NUMBER_TO_NATIONAL_FOR_JP_BOOL, false);
|
||||||
sDefaults.putIntArray(KEY_DISCONNECT_CAUSE_PLAY_BUSYTONE_INT_ARRAY,
|
sDefaults.putIntArray(KEY_DISCONNECT_CAUSE_PLAY_BUSYTONE_INT_ARRAY,
|
||||||
new int[] {4 /* BUSY */});
|
new int[] {4 /* BUSY */});
|
||||||
|
|||||||
Reference in New Issue
Block a user