diff options
| author | 2015-10-02 20:37:47 +0000 | |
|---|---|---|
| committer | 2015-10-02 20:37:47 +0000 | |
| commit | 2d574a5aa80fbd29e64d4da11eef7719dffd08be (patch) | |
| tree | 6daabad6a62929631902dd3825953962201a92bf | |
| parent | 9df717de9ad5d9aa3aeae0e801c98cf960607143 (diff) | |
| parent | f61b1fc66a24858321d64cabb7d772733566d240 (diff) | |
Merge "Add BLOCKED and REJECTED call types."
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/provider/CallLog.java | 16 |
3 files changed, 20 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 77c64d7e570f..c3a4a0c8919d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -24962,6 +24962,7 @@ package android.provider { public static class CallLog.Calls implements android.provider.BaseColumns { ctor public CallLog.Calls(); method public static java.lang.String getLastOutgoingCall(android.content.Context); + field public static final int BLOCKED_TYPE = 6; // 0x6 field public static final java.lang.String CACHED_FORMATTED_NUMBER = "formatted_number"; field public static final java.lang.String CACHED_LOOKUP_URI = "lookup_uri"; field public static final java.lang.String CACHED_MATCHED_NUMBER = "matched_number"; @@ -25000,6 +25001,7 @@ package android.provider { field public static final int PRESENTATION_PAYPHONE = 4; // 0x4 field public static final int PRESENTATION_RESTRICTED = 2; // 0x2 field public static final int PRESENTATION_UNKNOWN = 3; // 0x3 + field public static final int REJECTED_TYPE = 5; // 0x5 field public static final java.lang.String TRANSCRIPTION = "transcription"; field public static final java.lang.String TYPE = "type"; field public static final int VOICEMAIL_TYPE = 4; // 0x4 diff --git a/api/system-current.txt b/api/system-current.txt index cff0055cba2f..325aa28bef05 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -26918,6 +26918,7 @@ package android.provider { public static class CallLog.Calls implements android.provider.BaseColumns { ctor public CallLog.Calls(); method public static java.lang.String getLastOutgoingCall(android.content.Context); + field public static final int BLOCKED_TYPE = 6; // 0x6 field public static final java.lang.String CACHED_FORMATTED_NUMBER = "formatted_number"; field public static final java.lang.String CACHED_LOOKUP_URI = "lookup_uri"; field public static final java.lang.String CACHED_MATCHED_NUMBER = "matched_number"; @@ -26956,6 +26957,7 @@ package android.provider { field public static final int PRESENTATION_PAYPHONE = 4; // 0x4 field public static final int PRESENTATION_RESTRICTED = 2; // 0x2 field public static final int PRESENTATION_UNKNOWN = 3; // 0x3 + field public static final int REJECTED_TYPE = 5; // 0x5 field public static final java.lang.String TRANSCRIPTION = "transcription"; field public static final java.lang.String TYPE = "type"; field public static final int VOICEMAIL_TYPE = 4; // 0x4 diff --git a/core/java/android/provider/CallLog.java b/core/java/android/provider/CallLog.java index 4f880b1275e4..342f8c77d6ee 100644 --- a/core/java/android/provider/CallLog.java +++ b/core/java/android/provider/CallLog.java @@ -153,6 +153,18 @@ public class CallLog { /** * The type of the call (incoming, outgoing or missed). * <P>Type: INTEGER (int)</P> + * + * <p> + * Allowed values: + * <ul> + * <li>{@link #INCOMING_TYPE}</li> + * <li>{@link #OUTGOING_TYPE}</li> + * <li>{@link #MISSED_TYPE}</li> + * <li>{@link #VOICEMAIL_TYPE}</li> + * <li>{@link #REJECTED_TYPE}</li> + * <li>{@link #BLOCKED_TYPE}</li> + * </ul> + * </p> */ public static final String TYPE = "type"; @@ -164,6 +176,10 @@ public class CallLog { public static final int MISSED_TYPE = 3; /** Call log type for voicemails. */ public static final int VOICEMAIL_TYPE = 4; + /** Call log type for calls rejected by direct user action. */ + public static final int REJECTED_TYPE = 5; + /** Call log type for calls blocked automatically. */ + public static final int BLOCKED_TYPE = 6; /** * Bit-mask describing features of the call (e.g. video). |