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

Commit 5ba8fbe8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix UCE docs" into rvc-dev am: b8ec05c9 

Change-Id: I7e7be1a6e4bf7fbfef2ae57554e951067cbb6deb
parents 348c70b8 b8ec05c9

telephony/java/android/telephony/ims/ImsRcsManager.java

+7 −6
Original line number Diff line number Diff line
@@ -56,14 +56,15 @@ public class ImsRcsManager { 
     * Activity Action: Show the opt-in dialog for enabling or disabling RCS contact discovery

     * using User Capability Exchange (UCE).

     * <p>

     * An application that depends on contact discovery being enabled may send this intent

     * An application that depends on RCS contact discovery being enabled must send this intent

     * using {@link Context#startActivity(Intent)} to ask the user to opt-in for contacts upload for

     * capability exchange if it is currently disabled. Whether or not this setting has been enabled

     * can be queried using {@link RcsUceAdapter#isUceSettingEnabled()}.

     * capability exchange if it is currently disabled. Whether or not RCS contact discovery has

     * been enabled by the user can be queried using {@link RcsUceAdapter#isUceSettingEnabled()}.

     * <p>

     * This intent should only be sent if the carrier supports RCS capability exchange, which can be

     * queried using the key {@link CarrierConfigManager#KEY_USE_RCS_PRESENCE_BOOL}. Otherwise, the

     * setting will not be present.

     * This intent will always be handled by the system, however the application should only send

     * this Intent if the carrier supports RCS contact discovery, which can be queried using the key

     * {@link CarrierConfigManager#KEY_USE_RCS_PRESENCE_BOOL}. Otherwise, the RCS contact discovery

     * opt-in dialog will not be shown.

     * <p>

     * Input: A mandatory {@link Settings#EXTRA_SUB_ID} extra containing the subscription that the

     * setting will be be shown for.

telephony/java/android/telephony/ims/RcsUceAdapter.java

+3 −2
Original line number Diff line number Diff line
@@ -363,9 +363,10 @@ public class RcsUceAdapter { 
    /**

     * Change the user’s setting for whether or not UCE is enabled for the associated subscription.

     * <p>

     * If an application Requires UCE, they may launch an Activity using the Intent

     * If an application Requires UCE, they will launch an Activity using the Intent

     * {@link ImsRcsManager#ACTION_SHOW_CAPABILITY_DISCOVERY_OPT_IN}, which will ask the user if

     * they wish to enable this feature.

     * they wish to enable this feature. This setting should only be enabled after the user has

     * opted-in to capability exchange.

     * <p>

     * Note: This setting does not affect whether or not the device publishes its service

     * capabilities if the subscription supports presence publication.