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

Commit f9503019 authored by Nancy Chen's avatar Nancy Chen Committed by Android (Google) Code Review
Browse files

Merge "Adn queries for multi-SIM. (2/3)" into lmp-mr1-dev

parents d1f1ea76 b2299c13

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -28391,6 +28391,7 @@ package android.telecom { 
    method public void addNewIncomingCall(android.telecom.PhoneAccountHandle, android.os.Bundle);

    method public void cancelMissedCallsNotification();

    method public void clearAccounts();

    method public android.net.Uri getAdnUriForPhoneAccount(android.telecom.PhoneAccountHandle);

    method public android.telecom.PhoneAccountHandle getConnectionManager();

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

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

telecomm/java/android/telecom/TelecomManager.java

+19 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package android.telecom; 
import android.annotation.SystemApi;

import android.content.ComponentName;

import android.content.Context;

import android.net.Uri;

import android.os.Bundle;

import android.os.RemoteException;

import android.os.ServiceManager;
@@ -926,7 +927,6 @@ public class TelecomManager { 
     * @param accountHandle The handle for the account the MMI code should apply to.

     * @param dialString The digits to dial.

     * @return True if the digits were processed as an MMI code, false otherwise.

     *

     */

    public boolean handleMmi(PhoneAccountHandle accountHandle, String dialString) {

        ITelecomService service = getTelecomService();
@@ -940,6 +940,24 @@ public class TelecomManager { 
        return false;

    }



    /**

     * @param accountHandle The handle for the account to derive an adn query URI for or

     * {@code null} to return a URI which will use the default account.

     * @return The URI (with the content:// scheme) specific to the specified {@link PhoneAccount}

     * for the the content retrieve.

     */

    public Uri getAdnUriForPhoneAccount(PhoneAccountHandle accountHandle) {

        ITelecomService service = getTelecomService();

        if (service != null && accountHandle != null) {

            try {

                return service.getAdnUriForPhoneAccount(accountHandle);

            } catch (RemoteException e) {

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

            }

        }

        return Uri.parse("content://icc/adn");

    }



    /**

     * Removes the missed-call notification if one is present.

     * <p>

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

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.internal.telecom; 


import android.content.ComponentName;

import android.telecom.PhoneAccountHandle;

import android.net.Uri;

import android.os.Bundle;

import android.telecom.PhoneAccount;
@@ -173,6 +174,11 @@ interface ITelecomService { 
     */

    boolean handlePinMmiForPhoneAccount(in PhoneAccountHandle accountHandle, String dialString);



    /**

     * @see TelecomServiceImpl#getAdnUriForPhoneAccount

     */

    Uri getAdnUriForPhoneAccount(in PhoneAccountHandle accountHandle);



    /**

     * @see TelecomServiceImpl#isTtySupported

     */