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

Merge changes from topic 'hide_passpoint_r2' into oc-dev

Browse Source 
* changes:
  hotspot2: hide Release 2 APIs
  Voice Messaging Intent API.
This commit is contained in:
TreeHugger Robot
2017-05-30 18:47:06 +00:00
committed by Android (Google) Code Review
parent d2638591d9 ff323d3ce9
commit 4bd47fce86
5 changed files with 25 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/android/provider/ContactsContract.java
View File

@@ -8915,15 +8915,11 @@ public final class ContactsContract {
* ambiguous then the activity should prompt the user for the recipient to send the message
* to.
* <p>
* Voice Assistant may provide additional information to messaging app about which account
* to use for sending a message by populating {@link #EXTRA_SENDER_ACCOUNT_HASH}.
* <p>
* Output: nothing
*
* @see #EXTRA_RECIPIENT_CONTACT_URI
* @see #EXTRA_RECIPIENT_CONTACT_CHAT_ID
* @see #EXTRA_RECIPIENT_CONTACT_NAME
* @see #EXTRA_SENDER_ACCOUNT_HASH
* @see #METADATA_ACCOUNT_TYPE
* @see #METADATA_MIMETYPE
*/
@@ -8981,21 +8977,6 @@ public final class ContactsContract {
public static final String EXTRA_RECIPIENT_CONTACT_NAME =
"android.provider.extra.RECIPIENT_CONTACT_NAME";
/**
* This optional extra specifies the hash of the account that should be used by messaging
* app for sending voice message with {@link #ACTION_VOICE_SEND_MESSAGE_TO_CONTACTS}. The
* value of this extra is a {@code String} and should be the value of {@link
* android.accounts.Account#hashCode()} for some account returned by {@link
* android.accounts.AccountManager#getAccounts()}.
* <p>
* If the extra is not specified, the app can decide which account to use.
* <p>
* If the account specified in the extra cannot be used for any reason (account missing, not
* usable by the app, etc), the message should not be sent.
*/
public static final String EXTRA_SENDER_ACCOUNT_HASH =
"android.provider.extra.SENDER_ACCOUNT_HASH";
/**
* A string associated with an {@link #ACTION_VOICE_SEND_MESSAGE_TO_CONTACTS} activity
* describing {@link RawContacts#ACCOUNT_TYPE} for the corresponding Contacts Provider