Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix UCE docs" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-05-18 23:04:41 +00:00
committed by Android (Google) Code Review
parent de1f26432c 1735254a44
commit b8ec05c9f0
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
telephony/java/android/telephony/ims/ImsRcsManager.java
View File

@@ -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.

5
telephony/java/android/telephony/ims/RcsUceAdapter.java
View File

@@ -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.