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

Merge "IMS: Changes for MultiEndpoint" into nyc-dev

Browse Source
This commit is contained in:
Tyler Gunn
2016-03-24 02:39:07 +00:00
committed by Android (Google) Code Review
parent aebbf29964 65314501f4
commit 0e3aff1ab5
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
telephony/java/com/android/ims/ImsExternalCallState.java
View File

@@ -28,7 +28,7 @@ import android.telephony.Rlog;
*/ */
/** /**
* Parcelable object to handle VICE Dialog Information * Parcelable object to handle MultiEndpoint Dialog Information
* @hide * @hide
*/ */
public class ImsExternalCallState implements Parcelable { public class ImsExternalCallState implements Parcelable {
@@ -39,19 +39,30 @@ public class ImsExternalCallState implements Parcelable {
public static final int CALL_STATE_CONFIRMED = 1; public static final int CALL_STATE_CONFIRMED = 1;
public static final int CALL_STATE_TERMINATED = 2; public static final int CALL_STATE_TERMINATED = 2;
// Dialog Id // Dialog Id
public int mCallId; private int mCallId;
// Number // Number
public Uri mAddress; private Uri mAddress;
public boolean mIsPullable; private boolean mIsPullable;
// CALL_STATE_CONFIRMED / CALL_STATE_TERMINATED // CALL_STATE_CONFIRMED / CALL_STATE_TERMINATED
public int mCallState; private int mCallState;
// ImsCallProfile#CALL_TYPE_* // ImsCallProfile#CALL_TYPE_*
public int mCallType; private int mCallType;
public boolean mIsHeld; private boolean mIsHeld;
public ImsExternalCallState() { public ImsExternalCallState() {
} }
public ImsExternalCallState(int callId, Uri address, boolean isPullable, int callState,
int callType, boolean isCallheld) {
mCallId = callId;
mAddress = address;
mIsPullable = isPullable;
mCallState = callState;
mCallType = callType;
mIsHeld = isCallheld;
Rlog.d(TAG, "ImsExternalCallState = " + this);
}
public ImsExternalCallState(Parcel in) { public ImsExternalCallState(Parcel in) {
mCallId = in.readInt(); mCallId = in.readInt();
ClassLoader classLoader = ImsExternalCallState.class.getClassLoader(); ClassLoader classLoader = ImsExternalCallState.class.getClassLoader();
@@ -60,12 +71,7 @@ public class ImsExternalCallState implements Parcelable {
mCallState = in.readInt(); mCallState = in.readInt();
mCallType = in.readInt(); mCallType = in.readInt();
mIsHeld = (in.readInt() != 0); mIsHeld = (in.readInt() != 0);
Rlog.d(TAG, "ImsExternalCallState const = " + Rlog.d(TAG, "ImsExternalCallState const = " + this);
"callid = " + getCallId() +
", address = " + getAddress() +
", mCallState = " + getCallState() +
", calltype = " + getCallType() +
", isheld = " + isCallHeld());
} }
@Override @Override
@@ -81,6 +87,7 @@ public class ImsExternalCallState implements Parcelable {
out.writeInt(mCallState); out.writeInt(mCallState);
out.writeInt(mCallType); out.writeInt(mCallType);
out.writeInt(mIsHeld ? 1 : 0); out.writeInt(mIsHeld ? 1 : 0);
Rlog.d(TAG, "ImsExternalCallState writeToParcel = " + out.toString());
} }
public static final Parcelable.Creator<ImsExternalCallState> CREATOR = public static final Parcelable.Creator<ImsExternalCallState> CREATOR =

2
telephony/java/com/android/ims/internal/IImsExternalCallStateListener.aidl
View File

@@ -32,7 +32,7 @@ interface IImsExternalCallStateListener {
* *
* @return void. * @return void.
*/ */
void notifyRefreshExternalCallState(in List<ImsExternalCallState> externalCallDialogs); void onImsExternalCallStateUpdate(in List<ImsExternalCallState> externalCallDialogs);
} }

2
telephony/java/com/android/ims/internal/IImsMultiEndpoint.aidl
View File

@@ -34,5 +34,5 @@ interface IImsMultiEndpoint {
* Query api to get the latest Dialog Event Package information * Query api to get the latest Dialog Event Package information
* Should be invoked only after setListener is done * Should be invoked only after setListener is done
*/ */
void requestDialogEventPackageState(); void requestImsExternalCallStateInfo();
} }

7
telephony/java/com/android/internal/telephony/TelephonyProperties.java
View File

@@ -218,11 +218,4 @@ public interface TelephonyProperties
*/ */
static final String PROPERTY_VIDEOCALL_AUDIO_OUTPUT = "persist.radio.call.audio.output"; static final String PROPERTY_VIDEOCALL_AUDIO_OUTPUT = "persist.radio.call.audio.output";
/**
* For MultiEndpoint Feature
* If true: Dial intent is for call pull functionality
* if false: normal dial
*/
static final String EXTRA_IS_CALL_PULL =
"android.telephony.extra.IS_CALL_PULL";
} }