Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc5c95c7 authored by Nazanin Bakhshi's avatar Nazanin Bakhshi Committed by Automerger Merge Worker
Browse files

Merge "initialized carrier_certificate_string_array to an empty array instead... 

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: 12231e3a

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

Change-Id: I02ca50b4067f1466728b67e8919591070ce752d4
parents 2af9f091 12231e3a

telephony/java/android/telephony/CarrierConfigManager.java

+1 −1
Original line number Diff line number Diff line
@@ -4464,7 +4464,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 */});