diff options
| author | 2014-10-23 22:27:26 +0000 | |
|---|---|---|
| committer | 2014-10-23 22:27:27 +0000 | |
| commit | c1d001c3349e02fda7a23d93e101dff8c77441bf (patch) | |
| tree | 6e1dba25a77ce5060effd4aa07df186fea5fbf71 | |
| parent | 4c24abe9489d35b965161b5375fbc6b8ace819b2 (diff) | |
| parent | 5fc3863655c8ec8149845640cf05d184de83893f (diff) | |
Merge "Fix build breakage because missing API methods." into lmp-mr1-dev
| -rw-r--r-- | api/current.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 074175b5d347..f14daa77ff6f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28221,6 +28221,7 @@ package android.telecom { method public android.telecom.PhoneAccountHandle getAccountHandle(); method public android.net.Uri getAddress(); method public int getCapabilities(); + method public int getColor(); method public android.graphics.drawable.Drawable getIcon(android.content.Context); method public int getIconResId(); method public java.lang.CharSequence getLabel(); @@ -28234,6 +28235,7 @@ package android.telecom { 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 android.os.Parcelable.Creator CREATOR; + field public static final int NO_COLOR = -1; // 0xffffffff field public static final java.lang.String SCHEME_SIP = "sip"; field public static final java.lang.String SCHEME_TEL = "tel"; field public static final java.lang.String SCHEME_VOICEMAIL = "voicemail"; @@ -28245,6 +28247,7 @@ package android.telecom { method public android.telecom.PhoneAccount build(); method public android.telecom.PhoneAccount.Builder setAddress(android.net.Uri); method public android.telecom.PhoneAccount.Builder setCapabilities(int); + method public android.telecom.PhoneAccount.Builder setColor(int); method public android.telecom.PhoneAccount.Builder setIconResId(int); method public android.telecom.PhoneAccount.Builder setShortDescription(java.lang.CharSequence); method public android.telecom.PhoneAccount.Builder setSubscriptionAddress(android.net.Uri); |