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

Commit 9faf498f authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Rename the RTT audio flag in ImsStreamMediaProfile" am: 3d7b3fb7 

am: d2fbd99a

Change-Id: Iff21bbda55f9a6afd9866ebd0042321c6745bf40
parents 247b34ea d2fbd99a

api/system-current.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -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

telephony/java/android/telephony/ims/ImsStreamMediaProfile.java

+15 −8
Original line number Original line Diff line number Diff line
@@ -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;

    }

    }

}
 
}