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

Commit e15f8d66 authored by Grace Jia's avatar Grace Jia Committed by Android (Google) Code Review
Browse files

Merge "Deprecate TelecomManager#getPhoneAccountsForPackage for security."

parents 0e2ca773 0128b3c5

api/system-current.txt

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

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

    method @Deprecated public android.content.ComponentName getDefaultPhoneApp();

    method public java.util.List<android.telecom.PhoneAccountHandle> getPhoneAccountsForPackage();

    method @Deprecated public java.util.List<android.telecom.PhoneAccountHandle> getPhoneAccountsForPackage();

    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public java.util.List<android.telecom.PhoneAccountHandle> getPhoneAccountsSupportingScheme(String);

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

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

non-updatable-api/system-current.txt

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

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

    method @Deprecated public android.content.ComponentName getDefaultPhoneApp();

    method public java.util.List<android.telecom.PhoneAccountHandle> getPhoneAccountsForPackage();

    method @Deprecated public java.util.List<android.telecom.PhoneAccountHandle> getPhoneAccountsForPackage();

    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public java.util.List<android.telecom.PhoneAccountHandle> getPhoneAccountsSupportingScheme(String);

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

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

telecomm/java/android/telecom/TelecomManager.java

+3 −0
Original line number Diff line number Diff line
@@ -1209,11 +1209,14 @@ public class TelecomManager { 
    /**

     *  Returns a list of all {@link PhoneAccount}s registered for the calling package.

     *

     * @deprecated Use {@link #getSelfManagedPhoneAccounts()} instead to get only self-managed

     * {@link PhoneAccountHandle} for the calling package.

     * @return A list of {@code PhoneAccountHandle} objects.

     * @hide

     */

    @SystemApi

    @SuppressLint("Doclava125")

    @Deprecated

    public List<PhoneAccountHandle> getPhoneAccountsForPackage() {

        try {

            if (isServiceConnected()) {