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

Commit 113ca903 authored by Hakjun Choi's avatar Hakjun Choi Committed by Automerger Merge Worker
Browse files

Merge "Reinforce comments for newly added provisioning keys" into tm-dev am:... 

Merge "Reinforce comments for newly added provisioning keys" into tm-dev am: e595e78a am: 7962c33f am: bfda2286

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



Change-Id: I28fd2a7f441244e792cf685cbf08d5445d1f9ecd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ab2f7e81 bfda2286

telephony/java/android/telephony/CarrierConfigManager.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -908,6 +908,9 @@ public class CarrierConfigManager { 
     * Combines VoLTE, VT, VoWiFI calling provisioning into one parameter.

     * Combines VoLTE, VT, VoWiFI calling provisioning into one parameter.

     * @deprecated Use {@link Ims#KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE} instead for

     * @deprecated Use {@link Ims#KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE} instead for

     * finer-grained control.

     * finer-grained control.

     * changing carrier_volte_provisioning_required_bool requires changes to

     * mmtel_requires_provisioning_bundle and vice versa

     * {@link Ims#KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE}

     */

     */

    @Deprecated

    @Deprecated

    public static final String KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL

    public static final String KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL
@@ -5437,6 +5440,10 @@ public class CarrierConfigManager { 
         * </ul>

         * </ul>

         * <p> The values are defined in

         * <p> The values are defined in

         * {@link android.telephony.ims.stub.ImsRegistrationImplBase.ImsRegistrationTech}

         * {@link android.telephony.ims.stub.ImsRegistrationImplBase.ImsRegistrationTech}

         *

         * changing mmtel_requires_provisioning_bundle requires changes to

         * carrier_volte_provisioning_required_bool and vice versa

         * {@link Ims#KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL}

         */

         */

        public static final String KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE =

        public static final String KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE =

                KEY_PREFIX + "mmtel_requires_provisioning_bundle";

                KEY_PREFIX + "mmtel_requires_provisioning_bundle";