summaryrefslogtreecommitdiffstats
path: root/telecomm/java/android
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2015-07-28 20:31:05 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-28 20:31:05 +0000
commit3d83e74449acdf8195e0a4f7f82ad79fb3f891dd (patch)
tree3e6e5b4220ee1c0450b44d21db5b20757567b7fe /telecomm/java/android
parent108f5493edb50201d3dd2ba32a19db93edad8800 (diff)
parentbdbec480e8598bd959a2fc047cfad8b72c8a645b (diff)
downloadframeworks_base-3d83e74449acdf8195e0a4f7f82ad79fb3f891dd.zip
frameworks_base-3d83e74449acdf8195e0a4f7f82ad79fb3f891dd.tar.gz
frameworks_base-3d83e74449acdf8195e0a4f7f82ad79fb3f891dd.tar.bz2
am bdbec480: Merge "Add "Call subject" capability to phone accounts." into mnc-dev
* commit 'bdbec480e8598bd959a2fc047cfad8b72c8a645b': Add "Call subject" capability to phone accounts.
Diffstat (limited to 'telecomm/java/android')
-rw-r--r--telecomm/java/android/telecom/PhoneAccount.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/PhoneAccount.java b/telecomm/java/android/telecom/PhoneAccount.java
index df6fa2e..cdb0bf2 100644
--- a/telecomm/java/android/telecom/PhoneAccount.java
+++ b/telecomm/java/android/telecom/PhoneAccount.java
@@ -112,6 +112,15 @@ public final class PhoneAccount implements Parcelable {
public static final int CAPABILITY_MULTI_USER = 0x20;
/**
+ * Flag indicating that this {@code PhoneAccount} supports a subject for Calls. This means a
+ * caller is able to specify a short subject line for an outgoing call. A capable receiving
+ * device displays the call subject on the incoming call screen.
+ * <p>
+ * See {@link #getCapabilities}
+ */
+ public static final int CAPABILITY_CALL_SUBJECT = 0x40;
+
+ /**
* URI scheme for telephone number URIs.
*/
public static final String SCHEME_TEL = "tel";