Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nancy Chen
2014-10-23 00:42:23 +00:00
committed by Android (Google) Code Review
parent c5c029e91d 36c62f3e3c
commit df0ace2627
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telecomm/java/android/telecom/Call.java
View File

@@ -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);
}

12
telecomm/java/android/telecom/InCallAdapter.java
View File

@@ -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) {
}
}

3
telecomm/java/com/android/internal/telecom/IInCallAdapter.aidl
View File

@@ -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);