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

Commit 75d8c3aa authored by Hall Liu's avatar Hall Liu Committed by Automerger Merge Worker
Browse files

Merge "Mark TelecomManager#isRinging as a TestApi" am: 94091ace am:... 

Merge "Mark TelecomManager#isRinging as a TestApi" am: 94091ace am: 1ab98f18 am: 3293dd1e am: 2d0fdbdd

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

Change-Id: Ic35aa202935163c93753badd7acc7d749db57ba0
parents 14c87e33 2d0fdbdd

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3925,6 +3925,7 @@ package android.telecom { 
    method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public int getCurrentTtyMode();

    method @Nullable @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public String getDefaultDialerPackage(@NonNull android.os.UserHandle);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean isInEmergencyCall();

    method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PHONE_STATE}) public boolean isRinging();

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUserSelectedOutgoingPhoneAccount(@Nullable android.telecom.PhoneAccountHandle);

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

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

telecomm/java/android/telecom/TelecomManager.java

+1 −0
Original line number Diff line number Diff line
@@ -1645,6 +1645,7 @@ public class TelecomManager { 
     * @hide

     */

    @SystemApi

    @TestApi

    @RequiresPermission(anyOf = {

            READ_PRIVILEGED_PHONE_STATE,

            android.Manifest.permission.READ_PHONE_STATE