From e6bc66534bc44c3cb4ac5d726d55f16b69c46ba0 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Fri, 15 Apr 2022 21:57:43 +0000 Subject: [PATCH] Telephony: deprecate RESULT_SMS_RECEIVED_WHILE_ENCRYPTED This error code is no longer used since it was specific to Full Disk Encryption. This error code is part of the public API, so we have to deprecate it rather than simply remove it. Bug: 208476087 Change-Id: I02c10241fc905f938c4383f0a3720256acc1983d --- core/api/current.txt | 2 +- core/java/android/provider/Telephony.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/core/api/current.txt b/core/api/current.txt index d09b57fff80b2..1b85a316ae1dd 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -36133,7 +36133,7 @@ package android.provider { field public static final int RESULT_SMS_NULL_MESSAGE = 8; // 0x8 field public static final int RESULT_SMS_NULL_PDU = 7; // 0x7 field public static final int RESULT_SMS_OUT_OF_MEMORY = 3; // 0x3 - field public static final int RESULT_SMS_RECEIVED_WHILE_ENCRYPTED = 9; // 0x9 + field @Deprecated public static final int RESULT_SMS_RECEIVED_WHILE_ENCRYPTED = 9; // 0x9 field public static final int RESULT_SMS_UNSUPPORTED = 4; // 0x4 field @Deprecated public static final String SECRET_CODE_ACTION = "android.provider.Telephony.SECRET_CODE"; field public static final String SIM_FULL_ACTION = "android.provider.Telephony.SIM_FULL"; diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java index 5ff9263367510..69c1417486dbd 100644 --- a/core/java/android/provider/Telephony.java +++ b/core/java/android/provider/Telephony.java @@ -930,7 +930,12 @@ public final class Telephony { /** * Set as a "result" extra in the {@link #SMS_REJECTED_ACTION} intent to indicate an sms * was received while the phone was in encrypted state. + * + * @deprecated This result is never used on devices that launched with Android 10 (API + * level 29) or higher, since Android's storage encryption implementation has changed + * and it no longer can cause the rejection of incoming SMS messages. */ + @Deprecated public static final int RESULT_SMS_RECEIVED_WHILE_ENCRYPTED = 9; /**