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

Commit bfd25b35 authored by Michael Groover's avatar Michael Groover Committed by Automerger Merge Worker
Browse files

Merge "Update permission requirements for TelecomManager#getLine1Number" into... 

Merge "Update permission requirements for TelecomManager#getLine1Number" into rvc-dev am: f4cd234b am: e31e24be

Change-Id: If76fb143bc3209bd3e0caf9c1fa1a6f1236dbc64
parents e9fed77d e31e24be

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -46230,7 +46230,7 @@ package android.telecom { 
    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.List<android.telecom.PhoneAccountHandle> getCallCapablePhoneAccounts();

    method public String getDefaultDialerPackage();

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public android.telecom.PhoneAccountHandle getDefaultOutgoingPhoneAccount(String);

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getLine1Number(android.telecom.PhoneAccountHandle);

    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.READ_SMS, android.Manifest.permission.READ_PHONE_NUMBERS}, conditional=true) public String getLine1Number(android.telecom.PhoneAccountHandle);

    method public android.telecom.PhoneAccount getPhoneAccount(android.telecom.PhoneAccountHandle);

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.List<android.telecom.PhoneAccountHandle> getSelfManagedPhoneAccounts();

    method public android.telecom.PhoneAccountHandle getSimCallManager();

telecomm/java/android/telecom/TelecomManager.java

+12 −2
Original line number Diff line number Diff line
@@ -1534,12 +1534,22 @@ public class TelecomManager { 
    /**

     * Return the line 1 phone number for given phone account.

     *

     * Requires permission: {@link android.Manifest.permission#READ_PHONE_STATE}

     * <p>Requires Permission:

     *     {@link android.Manifest.permission#READ_SMS READ_SMS},

     *     {@link android.Manifest.permission#READ_PHONE_NUMBERS READ_PHONE_NUMBERS},

     *     or that the caller is the default SMS app for any API level.

     *     {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}

     *     for apps targeting SDK API level 29 and below.

     *

     * @param accountHandle The handle for the account retrieve a number for.

     * @return A string representation of the line 1 phone number.

     */

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    @SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges or default SMS app

    @RequiresPermission(anyOf = {

            android.Manifest.permission.READ_PHONE_STATE,

            android.Manifest.permission.READ_SMS,

            android.Manifest.permission.READ_PHONE_NUMBERS

            }, conditional = true)

    public String getLine1Number(PhoneAccountHandle accountHandle) {

        try {

            if (isServiceConnected()) {