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

Commit 1c80ac52 authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Add getSelfManagedPhoneAccounts() TelecomManager API." am: c4ea961f am: 1fb1c398 

am: b4282680

Change-Id: Ib0eae364d2fff21e80d04e740c34421d42c85c57
parents 41d82e61 b4282680

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -39340,6 +39340,7 @@ package android.telecom { 
    method public android.telecom.PhoneAccountHandle getDefaultOutgoingPhoneAccount(java.lang.String);

    method public java.lang.String getLine1Number(android.telecom.PhoneAccountHandle);

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

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

    method public android.telecom.PhoneAccountHandle getSimCallManager();

    method public java.lang.String getVoiceMailNumber(android.telecom.PhoneAccountHandle);

    method public boolean handleMmi(java.lang.String);

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -42778,6 +42778,7 @@ package android.telecom { 
    method public android.telecom.PhoneAccount getPhoneAccount(android.telecom.PhoneAccountHandle);

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

    method public java.util.List<android.telecom.PhoneAccountHandle> getPhoneAccountsSupportingScheme(java.lang.String);

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

    method public android.telecom.PhoneAccountHandle getSimCallManager();

    method public java.lang.String getVoiceMailNumber(android.telecom.PhoneAccountHandle);

    method public boolean handleMmi(java.lang.String);

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -39555,6 +39555,7 @@ package android.telecom { 
    method public android.telecom.PhoneAccountHandle getDefaultOutgoingPhoneAccount(java.lang.String);

    method public java.lang.String getLine1Number(android.telecom.PhoneAccountHandle);

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

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

    method public android.telecom.PhoneAccountHandle getSimCallManager();

    method public java.lang.String getVoiceMailNumber(android.telecom.PhoneAccountHandle);

    method public boolean handleMmi(java.lang.String);

telecomm/java/android/telecom/TelecomManager.java

+26 −0
Original line number Diff line number Diff line
@@ -754,6 +754,32 @@ public class TelecomManager { 
        return getCallCapablePhoneAccounts(false);

    }



    /**

     * Returns a list of {@link PhoneAccountHandle}s for self-managed {@link ConnectionService}s.

     * <p>

     * Self-Managed {@link ConnectionService}s have a {@link PhoneAccount} with

     * {@link PhoneAccount#CAPABILITY_SELF_MANAGED}.

     * <p>

     * Requires permission {@link android.Manifest.permission#READ_PHONE_STATE}, or that the caller

     * is the default dialer app.

     * <p>

     * A {@link SecurityException} will be thrown if a called is not the default dialer, or lacks

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

     *

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

     */

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    public List<PhoneAccountHandle> getSelfManagedPhoneAccounts() {

        try {

            if (isServiceConnected()) {

                return getTelecomService().getSelfManagedPhoneAccounts(mContext.getOpPackageName());

            }

        } catch (RemoteException e) {

            Log.e(TAG, "Error calling ITelecomService#getSelfManagedPhoneAccounts()", e);

        }

        return new ArrayList<>();

    }



    /**

     * Returns a list of {@link PhoneAccountHandle}s including those which have not been enabled

     * by the user.

telecomm/java/com/android/internal/telecom/ITelecomService.aidl

+5 −0
Original line number Diff line number Diff line
@@ -58,6 +58,11 @@ interface ITelecomService { 
    List<PhoneAccountHandle> getCallCapablePhoneAccounts(

            boolean includeDisabledAccounts, String callingPackage);



    /**

     * @see TelecomServiceImpl#getSelfManagedPhoneAccounts

     */

    List<PhoneAccountHandle> getSelfManagedPhoneAccounts(String callingPackage);



    /**

     * @see TelecomManager#getPhoneAccountsSupportingScheme

     */