diff options
| author | 2015-04-21 14:49:54 -0700 | |
|---|---|---|
| committer | 2015-04-21 15:03:29 -0700 | |
| commit | c539080a933747b7140bf33c2a5c82029e56fa41 (patch) | |
| tree | c7f1dc517661b05911fa4ba515f7691c24e852ff | |
| parent | 4cb5d80abeb88918534e90c2a7b58cdcba22ac77 (diff) | |
DO NOT MERGE Make CAPABILITY_VIDEO_CALLING public
Change was previously made in master
Change-Id: Ica37a2060dca35ed6c734852a12b8f9ab27cd8aa
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/PhoneAccount.java | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index bd1c3b7a37ee..f3542ce3ac27 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28706,6 +28706,7 @@ package android.telecom { field public static final int CAPABILITY_CONNECTION_MANAGER = 1; // 0x1 field public static final int CAPABILITY_PLACE_EMERGENCY_CALLS = 16; // 0x10 field public static final int CAPABILITY_SIM_SUBSCRIPTION = 4; // 0x4 + field public static final int CAPABILITY_VIDEO_CALLING = 8; // 0x8 field public static final android.os.Parcelable.Creator<android.telecom.PhoneAccount> CREATOR; field public static final int NO_HIGHLIGHT_COLOR = 0; // 0x0 field public static final int NO_ICON_TINT = 0; // 0x0 diff --git a/telecomm/java/android/telecom/PhoneAccount.java b/telecomm/java/android/telecom/PhoneAccount.java index 00d170fb98ba..bab460dfb71e 100644 --- a/telecomm/java/android/telecom/PhoneAccount.java +++ b/telecomm/java/android/telecom/PhoneAccount.java @@ -89,9 +89,7 @@ public class PhoneAccount implements Parcelable { * Flag indicating that this {@code PhoneAccount} is capable of placing video calls. * <p> * See {@link #getCapabilities} - * @hide */ - @SystemApi public static final int CAPABILITY_VIDEO_CALLING = 0x8; /** |