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

Commit 134e7888 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Expose android.telephony.DisconnectCause" into rvc-dev-plus-aosp am: 502d31dc 

Change-Id: If0af5aaf1c9043a2b8b222c05112c109179b8392
parents 04c40a28 502d31dc

api/current.txt

+79 −0
Original line number Diff line number Diff line
@@ -47447,6 +47447,85 @@ package android.telephony { 
    field public static final int VSNCP_TIMEOUT = 2236; // 0x8bc

  }













  public final class DisconnectCause {













    field public static final int ALREADY_DIALING = 72; // 0x48













    field public static final int ANSWERED_ELSEWHERE = 52; // 0x34













    field public static final int BUSY = 4; // 0x4













    field public static final int CALLING_DISABLED = 74; // 0x4a













    field public static final int CALL_BARRED = 20; // 0x14













    field public static final int CALL_PULLED = 51; // 0x33













    field public static final int CANT_CALL_WHILE_RINGING = 73; // 0x49













    field public static final int CDMA_ACCESS_BLOCKED = 35; // 0x23













    field public static final int CDMA_ACCESS_FAILURE = 32; // 0x20













    field public static final int CDMA_ALREADY_ACTIVATED = 49; // 0x31













    field public static final int CDMA_DROP = 27; // 0x1b













    field public static final int CDMA_INTERCEPT = 28; // 0x1c













    field public static final int CDMA_LOCKED_UNTIL_POWER_CYCLE = 26; // 0x1a













    field public static final int CDMA_NOT_EMERGENCY = 34; // 0x22













    field public static final int CDMA_PREEMPTED = 33; // 0x21













    field public static final int CDMA_REORDER = 29; // 0x1d













    field public static final int CDMA_RETRY_ORDER = 31; // 0x1f













    field public static final int CDMA_SO_REJECT = 30; // 0x1e













    field public static final int CONGESTION = 5; // 0x5













    field public static final int CS_RESTRICTED = 22; // 0x16













    field public static final int CS_RESTRICTED_EMERGENCY = 24; // 0x18













    field public static final int CS_RESTRICTED_NORMAL = 23; // 0x17













    field public static final int DATA_DISABLED = 54; // 0x36













    field public static final int DATA_LIMIT_REACHED = 55; // 0x37













    field public static final int DIALED_CALL_FORWARDING_WHILE_ROAMING = 57; // 0x39













    field public static final int DIALED_MMI = 39; // 0x27













    field public static final int DIAL_LOW_BATTERY = 62; // 0x3e













    field public static final int DIAL_MODIFIED_TO_DIAL = 48; // 0x30













    field public static final int DIAL_MODIFIED_TO_DIAL_VIDEO = 66; // 0x42













    field public static final int DIAL_MODIFIED_TO_SS = 47; // 0x2f













    field public static final int DIAL_MODIFIED_TO_USSD = 46; // 0x2e













    field public static final int DIAL_VIDEO_MODIFIED_TO_DIAL = 69; // 0x45













    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_PERM_FAILURE = 64; // 0x40













    field public static final int EMERGENCY_TEMP_FAILURE = 63; // 0x3f













    field public static final int ERROR_UNSPECIFIED = 36; // 0x24













    field public static final int FDN_BLOCKED = 21; // 0x15













    field public static final int ICC_ERROR = 19; // 0x13













    field public static final int IMEI_NOT_ACCEPTED = 58; // 0x3a













    field public static final int IMS_ACCESS_BLOCKED = 60; // 0x3c













    field public static final int IMS_MERGED_SUCCESSFULLY = 45; // 0x2d













    field public static final int IMS_SIP_ALTERNATE_EMERGENCY_CALL = 71; // 0x47













    field public static final int INCOMING_AUTO_REJECTED = 81; // 0x51













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













    field public static final int INCOMING_REJECTED = 16; // 0x10













    field public static final int INVALID_CREDENTIALS = 10; // 0xa













    field public static final int INVALID_NUMBER = 7; // 0x7













    field public static final int LIMIT_EXCEEDED = 15; // 0xf













    field public static final int LOCAL = 3; // 0x3













    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 MMI = 6; // 0x6













    field public static final int NORMAL = 2; // 0x2













    field public static final int NORMAL_UNSPECIFIED = 65; // 0x41













    field public static final int NOT_DISCONNECTED = 0; // 0x0













    field public static final int NOT_VALID = -1; // 0xffffffff













    field public static final int NO_PHONE_NUMBER_SUPPLIED = 38; // 0x26













    field public static final int NUMBER_UNREACHABLE = 8; // 0x8













    field public static final int OTASP_PROVISIONING_IN_PROCESS = 76; // 0x4c













    field public static final int OUTGOING_CANCELED = 44; // 0x2c













    field public static final int OUTGOING_EMERGENCY_CALL_PLACED = 80; // 0x50













    field public static final int OUTGOING_FAILURE = 43; // 0x2b













    field public static final int OUT_OF_NETWORK = 11; // 0xb













    field public static final int OUT_OF_SERVICE = 18; // 0x12













    field public static final int POWER_OFF = 17; // 0x11













    field public static final int SERVER_ERROR = 12; // 0xc













    field public static final int SERVER_UNREACHABLE = 9; // 0x9













    field public static final int TIMED_OUT = 13; // 0xd













    field public static final int TOO_MANY_ONGOING_CALLS = 75; // 0x4b













    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 WIFI_LOST = 59; // 0x3b













  }



























  public class IccOpenLogicalChannelResponse implements android.os.Parcelable {















    method public int describeContents();















    method public int getChannel();

























api/system-current.txt



+0
−79




























Original line number
Diff line number
Diff line








@@ -10659,85 +10659,6 @@ package android.telephony {













    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.DataSpecificRegistrationInfo> CREATOR;















  }



























  public final class DisconnectCause {













    field public static final int ALREADY_DIALING = 72; // 0x48













    field public static final int ANSWERED_ELSEWHERE = 52; // 0x34













    field public static final int BUSY = 4; // 0x4













    field public static final int CALLING_DISABLED = 74; // 0x4a













    field public static final int CALL_BARRED = 20; // 0x14













    field public static final int CALL_PULLED = 51; // 0x33













    field public static final int CANT_CALL_WHILE_RINGING = 73; // 0x49













    field public static final int CDMA_ACCESS_BLOCKED = 35; // 0x23













    field public static final int CDMA_ACCESS_FAILURE = 32; // 0x20













    field public static final int CDMA_ALREADY_ACTIVATED = 49; // 0x31













    field public static final int CDMA_DROP = 27; // 0x1b













    field public static final int CDMA_INTERCEPT = 28; // 0x1c













    field public static final int CDMA_LOCKED_UNTIL_POWER_CYCLE = 26; // 0x1a













    field public static final int CDMA_NOT_EMERGENCY = 34; // 0x22













    field public static final int CDMA_PREEMPTED = 33; // 0x21













    field public static final int CDMA_REORDER = 29; // 0x1d













    field public static final int CDMA_RETRY_ORDER = 31; // 0x1f













    field public static final int CDMA_SO_REJECT = 30; // 0x1e













    field public static final int CONGESTION = 5; // 0x5













    field public static final int CS_RESTRICTED = 22; // 0x16













    field public static final int CS_RESTRICTED_EMERGENCY = 24; // 0x18













    field public static final int CS_RESTRICTED_NORMAL = 23; // 0x17













    field public static final int DATA_DISABLED = 54; // 0x36













    field public static final int DATA_LIMIT_REACHED = 55; // 0x37













    field public static final int DIALED_CALL_FORWARDING_WHILE_ROAMING = 57; // 0x39













    field public static final int DIALED_MMI = 39; // 0x27













    field public static final int DIAL_LOW_BATTERY = 62; // 0x3e













    field public static final int DIAL_MODIFIED_TO_DIAL = 48; // 0x30













    field public static final int DIAL_MODIFIED_TO_DIAL_VIDEO = 66; // 0x42













    field public static final int DIAL_MODIFIED_TO_SS = 47; // 0x2f













    field public static final int DIAL_MODIFIED_TO_USSD = 46; // 0x2e













    field public static final int DIAL_VIDEO_MODIFIED_TO_DIAL = 69; // 0x45













    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_PERM_FAILURE = 64; // 0x40













    field public static final int EMERGENCY_TEMP_FAILURE = 63; // 0x3f













    field public static final int ERROR_UNSPECIFIED = 36; // 0x24













    field public static final int FDN_BLOCKED = 21; // 0x15













    field public static final int ICC_ERROR = 19; // 0x13













    field public static final int IMEI_NOT_ACCEPTED = 58; // 0x3a













    field public static final int IMS_ACCESS_BLOCKED = 60; // 0x3c













    field public static final int IMS_MERGED_SUCCESSFULLY = 45; // 0x2d













    field public static final int IMS_SIP_ALTERNATE_EMERGENCY_CALL = 71; // 0x47













    field public static final int INCOMING_AUTO_REJECTED = 81; // 0x51













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













    field public static final int INCOMING_REJECTED = 16; // 0x10













    field public static final int INVALID_CREDENTIALS = 10; // 0xa













    field public static final int INVALID_NUMBER = 7; // 0x7













    field public static final int LIMIT_EXCEEDED = 15; // 0xf













    field public static final int LOCAL = 3; // 0x3













    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 MMI = 6; // 0x6













    field public static final int NORMAL = 2; // 0x2













    field public static final int NORMAL_UNSPECIFIED = 65; // 0x41













    field public static final int NOT_DISCONNECTED = 0; // 0x0













    field public static final int NOT_VALID = -1; // 0xffffffff













    field public static final int NO_PHONE_NUMBER_SUPPLIED = 38; // 0x26













    field public static final int NUMBER_UNREACHABLE = 8; // 0x8













    field public static final int OTASP_PROVISIONING_IN_PROCESS = 76; // 0x4c













    field public static final int OUTGOING_CANCELED = 44; // 0x2c













    field public static final int OUTGOING_EMERGENCY_CALL_PLACED = 80; // 0x50













    field public static final int OUTGOING_FAILURE = 43; // 0x2b













    field public static final int OUT_OF_NETWORK = 11; // 0xb













    field public static final int OUT_OF_SERVICE = 18; // 0x12













    field public static final int POWER_OFF = 17; // 0x11













    field public static final int SERVER_ERROR = 12; // 0xc













    field public static final int SERVER_UNREACHABLE = 9; // 0x9













    field public static final int TIMED_OUT = 13; // 0xd













    field public static final int TOO_MANY_ONGOING_CALLS = 75; // 0x4b













    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 WIFI_LOST = 59; // 0x3b













  }



























  public final class ImsiEncryptionInfo implements android.os.Parcelable {















    method public int describeContents();















    method @Nullable public String getKeyIdentifier();

























telephony/api/system-current.txt



+0
−79




























Original line number
Diff line number
Diff line








@@ -179,85 +179,6 @@ package android.telephony {













    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.DataSpecificRegistrationInfo> CREATOR;















  }





























  public final class DisconnectCause {













    field public static final int ALREADY_DIALING = 72; // 0x48













    field public static final int ANSWERED_ELSEWHERE = 52; // 0x34













    field public static final int BUSY = 4; // 0x4













    field public static final int CALLING_DISABLED = 74; // 0x4a













    field public static final int CALL_BARRED = 20; // 0x14













    field public static final int CALL_PULLED = 51; // 0x33













    field public static final int CANT_CALL_WHILE_RINGING = 73; // 0x49













    field public static final int CDMA_ACCESS_BLOCKED = 35; // 0x23













    field public static final int CDMA_ACCESS_FAILURE = 32; // 0x20













    field public static final int CDMA_ALREADY_ACTIVATED = 49; // 0x31













    field public static final int CDMA_DROP = 27; // 0x1b













    field public static final int CDMA_INTERCEPT = 28; // 0x1c













    field public static final int CDMA_LOCKED_UNTIL_POWER_CYCLE = 26; // 0x1a













    field public static final int CDMA_NOT_EMERGENCY = 34; // 0x22













    field public static final int CDMA_PREEMPTED = 33; // 0x21













    field public static final int CDMA_REORDER = 29; // 0x1d













    field public static final int CDMA_RETRY_ORDER = 31; // 0x1f













    field public static final int CDMA_SO_REJECT = 30; // 0x1e













    field public static final int CONGESTION = 5; // 0x5













    field public static final int CS_RESTRICTED = 22; // 0x16













    field public static final int CS_RESTRICTED_EMERGENCY = 24; // 0x18













    field public static final int CS_RESTRICTED_NORMAL = 23; // 0x17













    field public static final int DATA_DISABLED = 54; // 0x36













    field public static final int DATA_LIMIT_REACHED = 55; // 0x37













    field public static final int DIALED_CALL_FORWARDING_WHILE_ROAMING = 57; // 0x39













    field public static final int DIALED_MMI = 39; // 0x27













    field public static final int DIAL_LOW_BATTERY = 62; // 0x3e













    field public static final int DIAL_MODIFIED_TO_DIAL = 48; // 0x30













    field public static final int DIAL_MODIFIED_TO_DIAL_VIDEO = 66; // 0x42













    field public static final int DIAL_MODIFIED_TO_SS = 47; // 0x2f













    field public static final int DIAL_MODIFIED_TO_USSD = 46; // 0x2e













    field public static final int DIAL_VIDEO_MODIFIED_TO_DIAL = 69; // 0x45













    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_PERM_FAILURE = 64; // 0x40













    field public static final int EMERGENCY_TEMP_FAILURE = 63; // 0x3f













    field public static final int ERROR_UNSPECIFIED = 36; // 0x24













    field public static final int FDN_BLOCKED = 21; // 0x15













    field public static final int ICC_ERROR = 19; // 0x13













    field public static final int IMEI_NOT_ACCEPTED = 58; // 0x3a













    field public static final int IMS_ACCESS_BLOCKED = 60; // 0x3c













    field public static final int IMS_MERGED_SUCCESSFULLY = 45; // 0x2d













    field public static final int IMS_SIP_ALTERNATE_EMERGENCY_CALL = 71; // 0x47













    field public static final int INCOMING_AUTO_REJECTED = 81; // 0x51













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













    field public static final int INCOMING_REJECTED = 16; // 0x10













    field public static final int INVALID_CREDENTIALS = 10; // 0xa













    field public static final int INVALID_NUMBER = 7; // 0x7













    field public static final int LIMIT_EXCEEDED = 15; // 0xf













    field public static final int LOCAL = 3; // 0x3













    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 MMI = 6; // 0x6













    field public static final int NORMAL = 2; // 0x2













    field public static final int NORMAL_UNSPECIFIED = 65; // 0x41













    field public static final int NOT_DISCONNECTED = 0; // 0x0













    field public static final int NOT_VALID = -1; // 0xffffffff













    field public static final int NO_PHONE_NUMBER_SUPPLIED = 38; // 0x26













    field public static final int NUMBER_UNREACHABLE = 8; // 0x8













    field public static final int OTASP_PROVISIONING_IN_PROCESS = 76; // 0x4c













    field public static final int OUTGOING_CANCELED = 44; // 0x2c













    field public static final int OUTGOING_EMERGENCY_CALL_PLACED = 80; // 0x50













    field public static final int OUTGOING_FAILURE = 43; // 0x2b













    field public static final int OUT_OF_NETWORK = 11; // 0xb













    field public static final int OUT_OF_SERVICE = 18; // 0x12













    field public static final int POWER_OFF = 17; // 0x11













    field public static final int SERVER_ERROR = 12; // 0xc













    field public static final int SERVER_UNREACHABLE = 9; // 0x9













    field public static final int TIMED_OUT = 13; // 0xd













    field public static final int TOO_MANY_ONGOING_CALLS = 75; // 0x4b













    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 WIFI_LOST = 59; // 0x3b













  }





























  public final class ImsiEncryptionInfo implements android.os.Parcelable {















    method public int describeContents();















    method @Nullable public String getKeyIdentifier();

































telephony/java/android/telephony/DisconnectCause.java



+0
−4




























Original line number
Diff line number
Diff line








@@ -17,16 +17,12 @@













package android.telephony;































import android.annotation.NonNull;













import android.annotation.SystemApi;















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.













 *













 * @hide















 */













@SystemApi















public final class DisconnectCause {































    /** The disconnect cause is not valid (Not received a disconnect cause) */