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

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

Un-hide Connection#onReject(String) and its associated capability 

am: 712acbe1

* commit '712acbe1':
  Un-hide Connection#onReject(String) and its associated capability
parents be3511b2 712acbe1

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -36263,6 +36263,7 @@ package android.telecom { 
    method public void onPostDialContinue(boolean);

    method public void onPullExternalCall();

    method public void onReject();

    method public void onReject(java.lang.String);

    method public void onSeparate();

    method public void onStateChanged(int);

    method public void onStopDtmfTone();
@@ -36292,6 +36293,7 @@ package android.telecom { 
    field public static final int CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO = 8388608; // 0x800000

    field public static final int CAPABILITY_CAN_PAUSE_VIDEO = 1048576; // 0x100000

    field public static final int CAPABILITY_CAN_PULL_CALL = 33554432; // 0x2000000

    field public static final int CAPABILITY_CAN_SEND_RESPONSE_VIA_CONNECTION = 4194304; // 0x400000

    field public static final int CAPABILITY_CAN_UPGRADE_TO_VIDEO = 524288; // 0x80000

    field public static final int CAPABILITY_DISCONNECT_FROM_CONFERENCE = 8192; // 0x2000

    field public static final int CAPABILITY_HOLD = 1; // 0x1

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -38876,6 +38876,7 @@ package android.telecom { 
    method public void onPostDialContinue(boolean);

    method public void onPullExternalCall();

    method public void onReject();

    method public void onReject(java.lang.String);

    method public void onSeparate();

    method public void onStateChanged(int);

    method public void onStopDtmfTone();
@@ -38905,6 +38906,7 @@ package android.telecom { 
    field public static final int CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO = 8388608; // 0x800000

    field public static final int CAPABILITY_CAN_PAUSE_VIDEO = 1048576; // 0x100000

    field public static final int CAPABILITY_CAN_PULL_CALL = 33554432; // 0x2000000

    field public static final int CAPABILITY_CAN_SEND_RESPONSE_VIA_CONNECTION = 4194304; // 0x400000

    field public static final int CAPABILITY_CAN_UPGRADE_TO_VIDEO = 524288; // 0x80000

    field public static final int CAPABILITY_DISCONNECT_FROM_CONFERENCE = 8192; // 0x2000

    field public static final int CAPABILITY_HOLD = 1; // 0x1

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -36335,6 +36335,7 @@ package android.telecom { 
    method public void onPostDialContinue(boolean);

    method public void onPullExternalCall();

    method public void onReject();

    method public void onReject(java.lang.String);

    method public void onSeparate();

    method public void onStateChanged(int);

    method public void onStopDtmfTone();
@@ -36364,6 +36365,7 @@ package android.telecom { 
    field public static final int CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO = 8388608; // 0x800000

    field public static final int CAPABILITY_CAN_PAUSE_VIDEO = 1048576; // 0x100000

    field public static final int CAPABILITY_CAN_PULL_CALL = 33554432; // 0x2000000

    field public static final int CAPABILITY_CAN_SEND_RESPONSE_VIA_CONNECTION = 4194304; // 0x400000

    field public static final int CAPABILITY_CAN_UPGRADE_TO_VIDEO = 524288; // 0x80000

    field public static final int CAPABILITY_DISCONNECT_FROM_CONFERENCE = 8192; // 0x2000

    field public static final int CAPABILITY_HOLD = 1; // 0x1

telecomm/java/android/telecom/Connection.java

+2 −4
Original line number Diff line number Diff line
@@ -260,7 +260,6 @@ public abstract class Connection extends Conferenceable { 
    /**

     * Indicates that the connection itself wants to handle any sort of reply response, rather than

     * relying on SMS.

     * @hide

     */

    public static final int CAPABILITY_CAN_SEND_RESPONSE_VIA_CONNECTION = 0x00400000;
@@ -1887,9 +1886,8 @@ public abstract class Connection extends Conferenceable { 
    public void onReject() {}



    /**

     * Notifies ths Connection of a request reject with a message.

     *

     * @hide

     * Notifies this Connection, which is in {@link #STATE_RINGING}, of

     * a request to reject with a message.

     */

    public void onReject(String replyMessage) {}