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

Commit 148a2bd5 authored by Eric Biggers's avatar Eric Biggers
Browse files

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
parent 82d2a958

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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";

core/java/android/provider/Telephony.java

+4 −5
Original line number Diff line number Diff line
@@ -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.

             * <p>

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



            /**