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

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

am 4f3585f6: am 7d6ea755: am dec36fd9: am 6f271251: Merge "Add constructor for... 

am 4f3585f6: am 7d6ea755: am dec36fd9: am 6f271251: Merge "Add constructor for DisconnectCause that does not require a tone." into lmp-dev

* commit '4f3585f694ab2c9cf78c4136fd91ea8650bec61a':
  Add constructor for DisconnectCause that does not require a tone.
parents f5d8cf70 50e6543d

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -28174,6 +28174,7 @@ package android.telecom { 
  public final class DisconnectCause implements android.os.Parcelable {

    ctor public DisconnectCause(int);

    ctor public DisconnectCause(int, java.lang.String);

    ctor public DisconnectCause(int, java.lang.CharSequence, java.lang.CharSequence, java.lang.String);

    ctor public DisconnectCause(int, java.lang.CharSequence, java.lang.CharSequence, java.lang.String, int);

    method public int describeContents();

    method public int getCode();

telecomm/java/android/telecom/Call.java

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ public final class Call { 


        /**

         * @return For a {@link #STATE_DISCONNECTED} {@code Call}, the disconnect cause expressed

         * by {@link android.telecomm.DisconnectCause}.

         * by {@link android.telecom.DisconnectCause}.

         */

        public DisconnectCause getDisconnectCause() {

            return mDisconnectCause;

telecomm/java/android/telecom/DisconnectCause.java

+11 −0
Original line number Diff line number Diff line
@@ -83,6 +83,17 @@ public final class DisconnectCause implements Parcelable { 
        this(code, null, null, reason, ToneGenerator.TONE_UNKNOWN);

    }



    /**

     * Creates a new DisconnectCause.

     * @param label The localized label to show to the user to explain the disconnect.

     * @param code The code for the disconnect cause.

     * @param description The localized description to show to the user to explain the disconnect.

     * @param reason The reason for the disconnect.

     */

    public DisconnectCause(int code, CharSequence label, CharSequence description, String reason) {

        this(code, label, description, reason, ToneGenerator.TONE_UNKNOWN);

    }



    /**

     * Creates a new DisconnectCause.

     *