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

Commit 6b576ad4 authored by Gary Jian's avatar Gary Jian Committed by Automerger Merge Worker
Browse files

Merge "Added nr advanced calling settings support" am: ec844533 am: c3661882 

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

Change-Id: I981d300ed36a522f6ba39bad485cabe7f71926a8
parents 5cd05e3d c3661882

core/java/android/provider/Telephony.java

+9 −0
Original line number Diff line number Diff line
@@ -5365,5 +5365,14 @@ public final class Telephony { 
         */

        public static final String COLUMN_D2D_STATUS_SHARING_SELECTED_CONTACTS =

                "d2d_sharing_contacts";



        /**

        * TelephonyProvider column name for NR Advanced calling

        * Determines if the user has enabled VoNR settings for this subscription.

        *

        * @hide

        */

        public static final String COLUMN_NR_ADVANCED_CALLING_ENABLED =

                "nr_advanced_calling_enabled";

    }

}

telephony/java/android/telephony/CarrierConfigManager.java

+11 −0
Original line number Diff line number Diff line
@@ -5283,6 +5283,16 @@ public class CarrierConfigManager { 
     */

    public static final String KEY_VONR_SETTING_VISIBILITY_BOOL = "vonr_setting_visibility_bool";



    /**

     * Flag specifying whether VoNR should be enabled for carrier.

     * If true, VoNr will be enabled. If false, hard disabled.

     *

     * Disabled by default.

     *

     * @hide

     */

    public static final String KEY_VONR_ENABLED_BOOL = "vonr_enabled_bool";



    /**

     * Determine whether unthrottle data retry when tracking area code (TAC/LAC) from cell changes

     *
@@ -5909,6 +5919,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_DISPLAY_NO_DATA_NOTIFICATION_ON_PERMANENT_FAILURE_BOOL, false);

        sDefaults.putBoolean(KEY_UNTHROTTLE_DATA_RETRY_WHEN_TAC_CHANGES_BOOL, false);

        sDefaults.putBoolean(KEY_VONR_SETTING_VISIBILITY_BOOL, false);

        sDefaults.putBoolean(KEY_VONR_ENABLED_BOOL, false);

    }



    /**

telephony/java/android/telephony/SubscriptionManager.java

+9 −0
Original line number Diff line number Diff line
@@ -948,6 +948,15 @@ public class SubscriptionManager { 
     */

    public static final String VOIMS_OPT_IN_STATUS = SimInfo.COLUMN_VOIMS_OPT_IN_STATUS;



    /**

     * TelephonyProvider column name for NR Advanced calling

     * Determines if the user has enabled VoNR settings for this subscription.

     *

     * @hide

     */

    public static final String NR_ADVANCED_CALLING_ENABLED =

            SimInfo.COLUMN_NR_ADVANCED_CALLING_ENABLED;



    /**

     * Profile class of the subscription

     * @hide