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

Commit 83f13ff6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Change-Id: Id9e93cf96308dd50147d9aed33da264791bbce20
parents 651fc05a e173fbf4
Loading
Loading
Loading
Loading
+7 −6
Original line number Original line 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
     * Activity Action: Show the opt-in dialog for enabling or disabling RCS contact discovery
     * using User Capability Exchange (UCE).
     * using User Capability Exchange (UCE).
     * <p>
     * <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
     * 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
     * capability exchange if it is currently disabled. Whether or not RCS contact discovery has
     * can be queried using {@link RcsUceAdapter#isUceSettingEnabled()}.
     * been enabled by the user can be queried using {@link RcsUceAdapter#isUceSettingEnabled()}.
     * <p>
     * <p>
     * This intent should only be sent if the carrier supports RCS capability exchange, which can be
     * This intent will always be handled by the system, however the application should only send
     * queried using the key {@link CarrierConfigManager#KEY_USE_RCS_PRESENCE_BOOL}. Otherwise, the
     * this Intent if the carrier supports RCS contact discovery, which can be queried using the key
     * setting will not be present.
     * {@link CarrierConfigManager#KEY_USE_RCS_PRESENCE_BOOL}. Otherwise, the RCS contact discovery
     * opt-in dialog will not be shown.
     * <p>
     * <p>
     * Input: A mandatory {@link Settings#EXTRA_SUB_ID} extra containing the subscription that the
     * Input: A mandatory {@link Settings#EXTRA_SUB_ID} extra containing the subscription that the
     * setting will be be shown for.
     * setting will be be shown for.
+3 −2
Original line number Original line 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.
     * Change the user’s setting for whether or not UCE is enabled for the associated subscription.
     * <p>
     * <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
     * {@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>
     * <p>
     * Note: This setting does not affect whether or not the device publishes its service
     * Note: This setting does not affect whether or not the device publishes its service
     * capabilities if the subscription supports presence publication.
     * capabilities if the subscription supports presence publication.