From 148a2bd5904da9773c79415de3af81ee7db339ea Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Tue, 17 May 2022 00:12:48 +0000 Subject: [PATCH] Revert deprecation of Telephony FDE constant The API council doesn't want this constant be deprecated. This is a partial revert of http://ag/17812636, which keeps and revises the text that was added to the documentation. Bug: 208476087 Bug: 232310299 Change-Id: I16b8c15288963d7c3318e8c614f0f7f0b091c221 --- core/api/current.txt | 2 +- core/java/android/provider/Telephony.java | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index ba92ba03f69cc..12c2b899093c2 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -36147,7 +36147,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 @Deprecated public static final int RESULT_SMS_RECEIVED_WHILE_ENCRYPTED = 9; // 0x9 + field 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 69c1417486dbd..7a5b00bb98bd2 100644 --- a/core/java/android/provider/Telephony.java +++ b/core/java/android/provider/Telephony.java @@ -930,12 +930,11 @@ 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. + *

+ * 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; /**