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

Commit 349d6e65 authored by Joonhun Shin's avatar Joonhun Shin Committed by Automerger Merge Worker
Browse files

Merge "Update Api docs for... 

Merge "Update Api docs for ProvisioningManager#get[Rcs]ProvisioningStatusForCapability and is[Rcs]ProvisioningRequiredForCapability." into tm-dev am: f1c5479d

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



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

telephony/java/android/telephony/ims/ProvisioningManager.java

+8 −6
Original line number Diff line number Diff line
@@ -1500,8 +1500,8 @@ public class ProvisioningManager { 
     * Get the provisioning status for the IMS RCS capability specified.

     *

     * If provisioning is not required for the queried

     * {@link ImsRcsManager.RcsImsCapabilityFlag} this method will always return

     * {@code true}.

     * {@link ImsRcsManager.RcsImsCapabilityFlag} or if the device does not support IMS

     * this method will always return {@code true}.

     *

     * @see CarrierConfigManager.Ims#KEY_CARRIER_RCS_PROVISIONING_REQUIRED_BOOL

     * @return true if the device is provisioned for the capability or does not require
@@ -1530,8 +1530,8 @@ public class ProvisioningManager { 
     * Get the provisioning status for the IMS RCS capability specified.

     *

     * If provisioning is not required for the queried

     * {@link ImsRcsManager.RcsImsCapabilityFlag} this method

     * will always return {@code true}.

     * {@link ImsRcsManager.RcsImsCapabilityFlag} or if the device does not support IMS

     * this method will always return {@code true}.

     *

     * <p> Requires Permission:

     * <ul>
@@ -1640,7 +1640,8 @@ public class ProvisioningManager { 
     * </ul>

     *

     * @return true if provisioning is required for the MMTEL capability and IMS

     * registration technology specified, false if it is not required.

     * registration technology specified, false if it is not required or if the device does not

     * support IMS.

     */

    @RequiresPermission(Manifest.permission.READ_PRECISE_PHONE_STATE)

    public boolean isProvisioningRequiredForCapability(
@@ -1667,7 +1668,8 @@ public class ProvisioningManager { 
     * </ul>

     *

     * @return true if provisioning is required for the RCS capability and IMS

     * registration technology specified, false if it is not required.

     * registration technology specified, false if it is not required or if the device does not

     * support IMS.

     */

    @RequiresPermission(Manifest.permission.READ_PRECISE_PHONE_STATE)

    public boolean isRcsProvisioningRequiredForCapability(