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

Commit 1285ab52 authored by Calvin Pan's avatar Calvin Pan Committed by Automerger Merge Worker
Browse files

Merge "Add a carrier config for non-RCS capabilities expiration" am: 454e15dc 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a998f7850c8be6f8813b8b4f079fb98f518e98b
parents 59d282be 454e15dc

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -39736,6 +39736,7 @@ package android.telephony { 
    field public static final String KEY_ENABLE_PRESENCE_GROUP_SUBSCRIBE_BOOL = "ims.enable_presence_group_subscribe_bool";

    field public static final String KEY_ENABLE_PRESENCE_PUBLISH_BOOL = "ims.enable_presence_publish_bool";

    field public static final String KEY_IMS_SINGLE_REGISTRATION_REQUIRED_BOOL = "ims.ims_single_registration_required_bool";

    field public static final String KEY_NON_RCS_CAPABILITIES_CACHE_EXPIRATION_SEC_INT = "ims.non_rcs_capabilities_cache_expiration_sec_int";

    field public static final String KEY_PREFIX = "ims.";

    field public static final String KEY_RCS_BULK_CAPABILITY_EXCHANGE_BOOL = "ims.rcs_bulk_capability_exchange_bool";

    field public static final String KEY_WIFI_OFF_DEFERRING_TIME_MILLIS_INT = "ims.wifi_off_deferring_time_millis_int";

telephony/java/android/telephony/CarrierConfigManager.java

+15 −0
Original line number Diff line number Diff line
@@ -3937,6 +3937,20 @@ public class CarrierConfigManager { 
        public static final String KEY_ENABLE_PRESENCE_GROUP_SUBSCRIBE_BOOL =

                KEY_PREFIX + "enable_presence_group_subscribe_bool";



        /**

         * An integer key associated with the period of time in seconds the non-rcs capability

         * information of each contact is cached on the device.

         * <p>

         * The rcs capability cache expiration sec is managed by

         * {@code android.telephony.ims.ProvisioningManager} but non-rcs capability is managed by

         * {@link CarrierConfigManager} since non-rcs capability will be provided via ACS or carrier

         * config.

         * <p>

         * The default value is 2592000 secs (30 days), see RCC.07 Annex A.1.9.

         */

        public static final String KEY_NON_RCS_CAPABILITIES_CACHE_EXPIRATION_SEC_INT =

                KEY_PREFIX + "non_rcs_capabilities_cache_expiration_sec_int";



        private Ims() {}



        private static PersistableBundle getDefaults() {
@@ -3947,6 +3961,7 @@ public class CarrierConfigManager { 
            defaults.putBoolean(KEY_ENABLE_PRESENCE_CAPABILITY_EXCHANGE_BOOL, false);

            defaults.putBoolean(KEY_RCS_BULK_CAPABILITY_EXCHANGE_BOOL, false);

            defaults.putBoolean(KEY_ENABLE_PRESENCE_GROUP_SUBSCRIBE_BOOL, true);

            defaults.putInt(KEY_NON_RCS_CAPABILITIES_CACHE_EXPIRATION_SEC_INT, 30 * 24 * 60 * 60);

            return defaults;

        }

    }