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

Commit 454d80ad authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Merge "Revert "telecom-bluetooth DND bug""

parents 9ecd8ef2 455fbf69

core/api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -40366,7 +40366,6 @@ package android.telecom { 
    field public static final String EVENT_DISPLAY_DIAGNOSTIC_MESSAGE = "android.telecom.event.DISPLAY_DIAGNOSTIC_MESSAGE";

    field public static final String EXTRA_DIAGNOSTIC_MESSAGE = "android.telecom.extra.DIAGNOSTIC_MESSAGE";

    field public static final String EXTRA_DIAGNOSTIC_MESSAGE_ID = "android.telecom.extra.DIAGNOSTIC_MESSAGE_ID";

    field public static final String EXTRA_IS_SUPPRESSED_BY_DO_NOT_DISTURB = "android.telecom.extra.IS_SUPPRESSED_BY_DO_NOT_DISTURB";

    field public static final String EXTRA_LAST_EMERGENCY_CALLBACK_TIME_MILLIS = "android.telecom.extra.LAST_EMERGENCY_CALLBACK_TIME_MILLIS";

    field public static final String EXTRA_SILENT_RINGING_REQUESTED = "android.telecom.extra.SILENT_RINGING_REQUESTED";

    field public static final String EXTRA_SUGGESTED_PHONE_ACCOUNTS = "android.telecom.extra.SUGGESTED_PHONE_ACCOUNTS";

core/api/system-current.txt

+0 −3
Original line number Diff line number Diff line
@@ -12469,8 +12469,6 @@ package android.telecom { 
    field public static final int CS_BOUND = 6; // 0x6

    field public static final int DIRECT_TO_VM_FINISHED = 103; // 0x67

    field public static final int DIRECT_TO_VM_INITIATED = 102; // 0x66

    field public static final int DND_CHECK_COMPLETED = 110; // 0x6e

    field public static final int DND_CHECK_INITIATED = 109; // 0x6d

    field public static final int FILTERING_COMPLETED = 107; // 0x6b

    field public static final int FILTERING_INITIATED = 106; // 0x6a

    field public static final int FILTERING_TIMED_OUT = 108; // 0x6c
@@ -12510,7 +12508,6 @@ package android.telecom { 
    field @NonNull public static final android.os.Parcelable.Creator<android.telecom.ParcelableCallAnalytics.EventTiming> CREATOR;

    field public static final int DIRECT_TO_VM_FINISHED_TIMING = 8; // 0x8

    field public static final int DISCONNECT_TIMING = 2; // 0x2

    field public static final int DND_PRE_CALL_PRE_CHECK_TIMING = 12; // 0xc

    field public static final int FILTERING_COMPLETED_TIMING = 10; // 0xa

    field public static final int FILTERING_TIMED_OUT_TIMING = 11; // 0xb

    field public static final int HOLD_TIMING = 3; // 0x3

telecomm/java/android/telecom/Call.java

+0 −12
Original line number Diff line number Diff line
@@ -167,18 +167,6 @@ public final class Call { 
    @Deprecated

    public static final String AVAILABLE_PHONE_ACCOUNTS = "selectPhoneAccountAccounts";



    /**

     * Extra key intended for {@link InCallService}s that notify the user of an incoming call. When

     * EXTRA_IS_SUPPRESSED_BY_DO_NOT_DISTURB returns true, the {@link InCallService} should not

     * interrupt the user of the incoming call because the call is being suppressed by Do Not

     * Disturb settings.

     *

     * This extra will be removed from the {@link Call} object for {@link InCallService}s that do

     * not hold the {@link android.Manifest.permission#READ_CONTACTS} permission.

     */

    public static final String EXTRA_IS_SUPPRESSED_BY_DO_NOT_DISTURB =

            "android.telecom.extra.IS_SUPPRESSED_BY_DO_NOT_DISTURB";



    /**

     * Key for extra used to pass along a list of {@link PhoneAccountSuggestion}s to the in-call

     * UI when a call enters the {@link #STATE_SELECT_PHONE_ACCOUNT} state. The list included here

telecomm/java/android/telecom/ParcelableCallAnalytics.java

+0 −3
Original line number Diff line number Diff line
@@ -111,8 +111,6 @@ public class ParcelableCallAnalytics implements Parcelable { 
        public static final int FILTERING_INITIATED = 106;

        public static final int FILTERING_COMPLETED = 107;

        public static final int FILTERING_TIMED_OUT = 108;

        public static final int DND_CHECK_INITIATED = 109;

        public static final int DND_CHECK_COMPLETED = 110;



        public static final int SKIP_RINGING = 200;

        public static final int SILENCE = 201;
@@ -197,7 +195,6 @@ public class ParcelableCallAnalytics implements Parcelable { 
        public static final int BLOCK_CHECK_FINISHED_TIMING = 9;

        public static final int FILTERING_COMPLETED_TIMING = 10;

        public static final int FILTERING_TIMED_OUT_TIMING = 11;

        public static final int DND_PRE_CALL_PRE_CHECK_TIMING = 12;

        /** {@hide} */

        public static final int START_CONNECTION_TO_REQUEST_DISCONNECT_TIMING = 12;