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

Merge "Rename the RTT audio flag in ImsStreamMediaProfile"

Browse Source 
am: 3d7b3fb737

Change-Id: Idac87bcff3f8deabc139cdcf2e3dec6e9c380acc
This commit is contained in:
Hall Liu
2019-02-26 14:15:22 -08:00
committed by android-build-merger
parent 07113dcf4a 3d7b3fb737
commit d2fbd99a76
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/system-current.txt
View File

@@ -7259,12 +7259,12 @@ package android.telephony.ims {
method public int describeContents(); method public int describeContents();
method public int getAudioDirection(); method public int getAudioDirection();
method public int getAudioQuality(); method public int getAudioQuality();
method public boolean getRttAudioSpeech();
method public int getRttMode(); method public int getRttMode();
method public int getVideoDirection(); method public int getVideoDirection();
method public int getVideoQuality(); method public int getVideoQuality();
method public boolean isReceivingRttAudio();
method public boolean isRttCall(); method public boolean isRttCall();
method public void setRttAudioSpeech(boolean); method public void setReceivingRttAudio(boolean);
method public void setRttMode(int); method public void setRttMode(int);
method public void writeToParcel(android.os.Parcel, int); method public void writeToParcel(android.os.Parcel, int);
field public static final int AUDIO_QUALITY_AMR = 1; // 0x1 field public static final int AUDIO_QUALITY_AMR = 1; // 0x1

23
telephony/java/android/telephony/ims/ImsStreamMediaProfile.java
View File

@@ -99,7 +99,7 @@ public final class ImsStreamMediaProfile implements Parcelable {
public int mRttMode; public int mRttMode;
// RTT Audio Speech Indicator // RTT Audio Speech Indicator
/** @hide */ /** @hide */
public boolean mHasRttAudioSpeech = false; public boolean mIsReceivingRttAudio = false;
/** @hide */ /** @hide */
public ImsStreamMediaProfile(Parcel in) { public ImsStreamMediaProfile(Parcel in) {
@@ -201,7 +201,7 @@ public final class ImsStreamMediaProfile implements Parcelable {
", videoQuality=" + mVideoQuality + ", videoQuality=" + mVideoQuality +
", videoDirection=" + mVideoDirection + ", videoDirection=" + mVideoDirection +
", rttMode=" + mRttMode + ", rttMode=" + mRttMode +
", hasRttAudioSpeech=" + mHasRttAudioSpeech + " }"; ", hasRttAudioSpeech=" + mIsReceivingRttAudio + " }";
} }
@Override @Override
@@ -216,7 +216,7 @@ public final class ImsStreamMediaProfile implements Parcelable {
out.writeInt(mVideoQuality); out.writeInt(mVideoQuality);
out.writeInt(mVideoDirection); out.writeInt(mVideoDirection);
out.writeInt(mRttMode); out.writeInt(mRttMode);
out.writeBoolean(mHasRttAudioSpeech); out.writeBoolean(mIsReceivingRttAudio);
} }
private void readFromParcel(Parcel in) { private void readFromParcel(Parcel in) {
@@ -225,7 +225,7 @@ public final class ImsStreamMediaProfile implements Parcelable {
mVideoQuality = in.readInt(); mVideoQuality = in.readInt();
mVideoDirection = in.readInt(); mVideoDirection = in.readInt();
mRttMode = in.readInt(); mRttMode = in.readInt();
mHasRttAudioSpeech = in.readBoolean(); mIsReceivingRttAudio = in.readBoolean();
} }
public static final Creator<ImsStreamMediaProfile> CREATOR = public static final Creator<ImsStreamMediaProfile> CREATOR =
@@ -256,8 +256,12 @@ public final class ImsStreamMediaProfile implements Parcelable {
mRttMode = rttMode; mRttMode = rttMode;
} }
public void setRttAudioSpeech(boolean audioOn) { /**
mHasRttAudioSpeech = audioOn; * Sets whether the remote party is transmitting audio over the RTT call.
* @param audioOn true if audio is being received, false otherwise.
*/
public void setReceivingRttAudio(boolean audioOn) {
mIsReceivingRttAudio = audioOn;
} }
public int getAudioQuality() { public int getAudioQuality() {
@@ -280,7 +284,10 @@ public final class ImsStreamMediaProfile implements Parcelable {
return mRttMode; return mRttMode;
} }
public boolean getRttAudioSpeech() { /**
return mHasRttAudioSpeech; * @return true if remote party is transmitting audio, false otherwise.
*/
public boolean isReceivingRttAudio() {
return mIsReceivingRttAudio;
} }
} }