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

Commit d4e270a8 authored by Hall Liu's avatar Hall Liu Committed by Automerger Merge Worker
Browse files

Merge "Unhide and update documentation for DisconnectCause" am: 61a728ae

Change-Id: I71927e12920c3d6951159250ee0e34bd6241f0c9
parents 331c9243 61a728ae
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -45279,6 +45279,7 @@ package android.telephony {
    field public static final int DIAL_VIDEO_MODIFIED_TO_DIAL_VIDEO = 70; // 0x46
    field public static final int DIAL_VIDEO_MODIFIED_TO_SS = 67; // 0x43
    field public static final int DIAL_VIDEO_MODIFIED_TO_USSD = 68; // 0x44
    field public static final int EMERGENCY_CALL_OVER_WFC_NOT_AVAILABLE = 78; // 0x4e
    field public static final int EMERGENCY_PERM_FAILURE = 64; // 0x40
    field public static final int EMERGENCY_TEMP_FAILURE = 63; // 0x3f
    field public static final int ERROR_UNSPECIFIED = 36; // 0x24
@@ -45297,6 +45298,7 @@ package android.telephony {
    field public static final int LOST_SIGNAL = 14; // 0xe
    field public static final int LOW_BATTERY = 61; // 0x3d
    field public static final int MAXIMUM_NUMBER_OF_CALLS_REACHED = 53; // 0x35
    field public static final int MEDIA_TIMEOUT = 77; // 0x4d
    field public static final int MMI = 6; // 0x6
    field public static final int NORMAL = 2; // 0x2
    field public static final int NORMAL_UNSPECIFIED = 65; // 0x41
@@ -45318,6 +45320,7 @@ package android.telephony {
    field public static final int UNOBTAINABLE_NUMBER = 25; // 0x19
    field public static final int VIDEO_CALL_NOT_ALLOWED_WHILE_TTY_ENABLED = 50; // 0x32
    field public static final int VOICEMAIL_NUMBER_MISSING = 40; // 0x28
    field public static final int WFC_SERVICE_NOT_AVAILABLE_IN_THIS_LOCATION = 79; // 0x4f
    field public static final int WIFI_LOST = 59; // 0x3b
  }
+2 −1
Original line number Diff line number Diff line
@@ -764,7 +764,8 @@ public class PhoneStateListener {
     *
     */
    @RequiresPermission((android.Manifest.permission.READ_PRECISE_PHONE_STATE))
    public void onCallDisconnectCauseChanged(int disconnectCause, int preciseDisconnectCause) {
    public void onCallDisconnectCauseChanged(@Annotation.DisconnectCauses int disconnectCause,
            int preciseDisconnectCause) {
        // default implementation empty
    }

+2 −3
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ import android.compat.annotation.UnsupportedAppUsage;
/**
 * Describes the cause of a disconnected call. Those disconnect causes can be converted into a more
 * generic {@link android.telecom.DisconnectCause} object.
 *
 * Used in {@link PhoneStateListener#onCallDisconnectCauseChanged}.
 */
public final class DisconnectCause {

@@ -333,20 +335,17 @@ public final class DisconnectCause {
    /**
     * Indicates that the call is dropped due to RTCP inactivity, primarily due to media path
     * disruption.
     * @hide
     */
    public static final int MEDIA_TIMEOUT = 77;

    /**
     * Indicates that an emergency call cannot be placed over WFC because the service is not
     * available in the current location.
     * @hide
     */
    public static final int EMERGENCY_CALL_OVER_WFC_NOT_AVAILABLE = 78;

    /**
     * Indicates that WiFi calling service is not available in the current location.
     * @hide
     */
    public static final int WFC_SERVICE_NOT_AVAILABLE_IN_THIS_LOCATION = 79;