Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d574a5a authored by Andrew Lee's avatar Andrew Lee Committed by Android (Google) Code Review
Browse files

Merge "Add BLOCKED and REJECTED call types."

parents 9df717de f61b1fc6

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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

core/java/android/provider/CallLog.java

+16 −0
Original line number Diff line number Diff line
@@ -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).