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

Commit e15d06f8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Move READ_PHONE_STATE compat id to @hide" into sc-dev am: 9f43163b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14226665

Change-Id: I5009c5b10a6f66d51c798d232da8bebd88927575
parents 6b363d34 9f43163b

core/api/current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -40289,7 +40289,6 @@ package android.telecom { 
    field public static final int DURATION_MEDIUM = 2; // 0x2

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

    field public static final int DURATION_SHORT = 1; // 0x1

    field public static final int DURATION_SHORT = 1; // 0x1

    field public static final int DURATION_VERY_SHORT = 0; // 0x0

    field public static final int DURATION_VERY_SHORT = 0; // 0x0

    field public static final long ENABLE_GET_CALL_STATE_PERMISSION_PROTECTION = 157233955L; // 0x95f3323L

    field public static final String EXTRA_CALL_BACK_NUMBER = "android.telecom.extra.CALL_BACK_NUMBER";

    field public static final String EXTRA_CALL_BACK_NUMBER = "android.telecom.extra.CALL_BACK_NUMBER";

    field public static final String EXTRA_CALL_DISCONNECT_CAUSE = "android.telecom.extra.CALL_DISCONNECT_CAUSE";

    field public static final String EXTRA_CALL_DISCONNECT_CAUSE = "android.telecom.extra.CALL_DISCONNECT_CAUSE";

    field public static final String EXTRA_CALL_DISCONNECT_MESSAGE = "android.telecom.extra.CALL_DISCONNECT_MESSAGE";

    field public static final String EXTRA_CALL_DISCONNECT_MESSAGE = "android.telecom.extra.CALL_DISCONNECT_MESSAGE";

telecomm/java/android/telecom/TelecomManager.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -1011,6 +1011,7 @@ public class TelecomManager { 
     * Enable READ_PHONE_STATE protection on APIs querying and notifying call state, such as

     * Enable READ_PHONE_STATE protection on APIs querying and notifying call state, such as

     * {@code TelecomManager#getCallState}, {@link TelephonyManager#getCallStateForSubscription()},

     * {@code TelecomManager#getCallState}, {@link TelephonyManager#getCallStateForSubscription()},

     * and {@link android.telephony.TelephonyCallback.CallStateListener}.

     * and {@link android.telephony.TelephonyCallback.CallStateListener}.

     * @hide

     */

     */

    @ChangeId

    @ChangeId

    @EnabledSince(targetSdkVersion = Build.VERSION_CODES.S)

    @EnabledSince(targetSdkVersion = Build.VERSION_CODES.S)