From 455fbf69c30d705d0fb2bee0085dbd34e97d5211 Mon Sep 17 00:00:00 2001 From: Tyler Gunn Date: Tue, 8 Nov 2022 15:40:22 +0000 Subject: [PATCH] Revert "telecom-bluetooth DND bug" Revert submission 19521928-telecomBluetoothDndBug Reason for revert: Causes crash on call reported in b/258128736 Reverted Changes: If275c2370:telecom-bluetooth DND bug I873823def:telecom-bluetooth DND bug Change-Id: Ib876bf0a82c2657a14080b77ff6c49b177f67637 --- core/api/current.txt | 1 - core/api/system-current.txt | 3 --- telecomm/java/android/telecom/Call.java | 12 ------------ .../android/telecom/ParcelableCallAnalytics.java | 3 --- 4 files changed, 19 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index f98c0b5311e55..a0690c008e964 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -40121,7 +40121,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"; diff --git a/core/api/system-current.txt b/core/api/system-current.txt index db41a7eeb5e46..a87f2e2bdaee5 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -12327,8 +12327,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 @@ -12368,7 +12366,6 @@ package android.telecom { field @NonNull public static final android.os.Parcelable.Creator 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 diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java index 5cef2cb0a1613..432af3aa1aa03 100644 --- a/telecomm/java/android/telecom/Call.java +++ b/telecomm/java/android/telecom/Call.java @@ -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 diff --git a/telecomm/java/android/telecom/ParcelableCallAnalytics.java b/telecomm/java/android/telecom/ParcelableCallAnalytics.java index a69dfb0b255f4..ff87ab00ae8bf 100644 --- a/telecomm/java/android/telecom/ParcelableCallAnalytics.java +++ b/telecomm/java/android/telecom/ParcelableCallAnalytics.java @@ -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;