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

Commit 2ff95729 authored by Nancy Chen's avatar Nancy Chen Committed by Android Git Automerger
Browse files

am df0ace26: Merge "Add an option to set the selected phone account as the... 

am df0ace26: Merge "Add an option to set the selected phone account as the default. (1/3)" into lmp-sprout-dev

* commit 'df0ace26':
  Add an option to set the selected phone account as the default. (1/3)
parents 6837b6af df0ace26

telecomm/java/android/telecom/Call.java

+3 −3
Original line number Diff line number Diff line
@@ -484,10 +484,10 @@ public final class Call { 


    /**

     * Notifies this {@code Call} that an account has been selected and to proceed with placing

     * an outgoing call.

     * an outgoing call. Optionally sets this account as the default account.

     */

    public void phoneAccountSelected(PhoneAccountHandle accountHandle) {

        mInCallAdapter.phoneAccountSelected(mTelecomCallId, accountHandle);

    public void phoneAccountSelected(PhoneAccountHandle accountHandle, boolean setDefault) {

        mInCallAdapter.phoneAccountSelected(mTelecomCallId, accountHandle, setDefault);



    }

telecomm/java/android/telecom/InCallAdapter.java

+7 −5
Original line number Diff line number Diff line
@@ -189,14 +189,16 @@ public final class InCallAdapter { 
    }



    /**

     * Instructs Telecom to add a PhoneAccountHandle to the specified call

     * Instructs Telecom to add a PhoneAccountHandle to the specified call.

     *

     * @param callId The identifier of the call

     * @param accountHandle The PhoneAccountHandle through which to place the call

     * @param callId The identifier of the call.

     * @param accountHandle The PhoneAccountHandle through which to place the call.

     * @param setDefault {@code True} if this account should be set as the default for calls.

     */

    public void phoneAccountSelected(String callId, PhoneAccountHandle accountHandle) {

    public void phoneAccountSelected(String callId, PhoneAccountHandle accountHandle,

            boolean setDefault) {

        try {

            mAdapter.phoneAccountSelected(callId, accountHandle);

            mAdapter.phoneAccountSelected(callId, accountHandle, setDefault);

        } catch (RemoteException e) {

        }

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ oneway interface IInCallAdapter { 


    void postDialContinue(String callId, boolean proceed);



    void phoneAccountSelected(String callId, in PhoneAccountHandle accountHandle);

    void phoneAccountSelected(String callId, in PhoneAccountHandle accountHandle,

            boolean setDefault);



    void conference(String callId, String otherCallId);