Merge "Fix more AIDL warnings in Radio HAL and lock it up" into main

This commit is contained in:
Treehugger Robot
2024-11-20 20:56:51 +00:00
committed by Gerrit Code Review
128 changed files with 217 additions and 152 deletions

View File

@@ -14,6 +14,7 @@ aidl_interface {
host_supported: true,
srcs: ["android/hardware/radio/*.aidl"],
stability: "vintf",
flags: ["-Werror"],
backend: {
cpp: {
enabled: true,
@@ -48,6 +49,7 @@ aidl_interface {
srcs: ["android/hardware/radio/config/*.aidl"],
stability: "vintf",
imports: ["android.hardware.radio-V4"],
flags: ["-Werror"],
backend: {
cpp: {
enabled: true,
@@ -82,6 +84,7 @@ aidl_interface {
srcs: ["android/hardware/radio/data/*.aidl"],
stability: "vintf",
imports: ["android.hardware.radio-V4"],
flags: ["-Werror"],
backend: {
cpp: {
enabled: true,
@@ -115,6 +118,7 @@ aidl_interface {
srcs: ["android/hardware/radio/messaging/*.aidl"],
stability: "vintf",
imports: ["android.hardware.radio-V4"],
flags: ["-Werror"],
backend: {
cpp: {
enabled: true,
@@ -148,6 +152,7 @@ aidl_interface {
srcs: ["android/hardware/radio/modem/*.aidl"],
stability: "vintf",
imports: ["android.hardware.radio-V4"],
flags: ["-Werror"],
backend: {
cpp: {
enabled: true,
@@ -181,6 +186,7 @@ aidl_interface {
srcs: ["android/hardware/radio/network/*.aidl"],
stability: "vintf",
imports: ["android.hardware.radio-V4"],
flags: ["-Werror"],
backend: {
cpp: {
enabled: true,
@@ -213,6 +219,7 @@ aidl_interface {
host_supported: true,
srcs: ["android/hardware/radio/sap/*.aidl"],
stability: "vintf",
flags: ["-Werror"],
backend: {
cpp: {
enabled: true,
@@ -241,6 +248,7 @@ aidl_interface {
host_supported: true,
srcs: ["android/hardware/radio/sim/*.aidl"],
stability: "vintf",
flags: ["-Werror"],
imports: [
"android.hardware.radio-V4",
"android.hardware.radio.config-V4",
@@ -287,6 +295,7 @@ aidl_interface {
srcs: ["android/hardware/radio/voice/*.aidl"],
stability: "vintf",
imports: ["android.hardware.radio-V4"],
flags: ["-Werror"],
backend: {
cpp: {
enabled: true,
@@ -322,6 +331,7 @@ aidl_interface {
"android.hardware.radio-V4",
"android.hardware.radio.data-V4",
],
flags: ["-Werror"],
backend: {
cpp: {
enabled: false,
@@ -356,6 +366,7 @@ aidl_interface {
srcs: ["android/hardware/radio/ims/*.aidl"],
stability: "vintf",
imports: ["android.hardware.radio-V4"],
flags: ["-Werror"],
backend: {
cpp: {
enabled: false,

View File

@@ -17,9 +17,10 @@
* This interface is used by telephony and telecom to talk to cellular radio for the purpose of
* radio configuration, and it is not associated with any specific modem or slot.
* All the functions have minimum one parameter:
* serial: which corresponds to serial no. of request. Serial numbers must only be memorized for the
* duration of a method call. If clients provide colliding serials (including passing the same
* serial to different methods), multiple responses (one for each method call) must still be served.
* serial: which corresponds to the serial number of the request. Serial numbers must only be
* memorized for the duration of a method call. If clients provide colliding serials (including
* passing the same serial to different methods), multiple responses (one for each method call) must
* still be served.
*/
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //

View File

@@ -33,7 +33,7 @@
package android.hardware.radio.data;
/* @hide */
@Backing(type="int") @JavaDerive(toString=true) @VintfStability
@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
enum DataCallFailCause {
NONE = 0,
OPERATOR_BARRED = 0x08,

View File

@@ -37,9 +37,9 @@ package android.hardware.radio.data;
parcelable DataProfileInfo {
int profileId;
String apn;
android.hardware.radio.data.PdpProtocolType protocol;
android.hardware.radio.data.PdpProtocolType roamingProtocol;
android.hardware.radio.data.ApnAuthType authType;
android.hardware.radio.data.PdpProtocolType protocol = android.hardware.radio.data.PdpProtocolType.IP;
android.hardware.radio.data.PdpProtocolType roamingProtocol = android.hardware.radio.data.PdpProtocolType.IP;
android.hardware.radio.data.ApnAuthType authType = android.hardware.radio.data.ApnAuthType.NO_PAP_NO_CHAP;
String user;
String password;
int type;

View File

@@ -33,7 +33,7 @@
package android.hardware.radio.data;
/* @hide */
@Backing(type="byte") @JavaDerive(toString=true) @VintfStability
@Backing(type="byte") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
enum DataThrottlingAction {
NO_DATA_THROTTLING,
THROTTLE_SECONDARY_CARRIER,

View File

@@ -33,7 +33,7 @@
package android.hardware.radio.data;
/* @hide */
@JavaDerive(toString=true) @VintfStability
@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
parcelable LinkAddress {
String address;
int addressProperties;

View File

@@ -33,7 +33,7 @@
package android.hardware.radio.data;
/* @hide */
@JavaDerive(toString=true) @VintfStability
@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
parcelable PortRange {
int start;
int end;

View File

@@ -36,7 +36,7 @@ package android.hardware.radio.data;
@JavaDerive(toString=true) @VintfStability
parcelable RouteSelectionDescriptor {
byte precedence;
android.hardware.radio.data.PdpProtocolType sessionType;
android.hardware.radio.data.PdpProtocolType sessionType = android.hardware.radio.data.PdpProtocolType.IP;
byte sscMode;
android.hardware.radio.data.SliceInfo[] sliceInfo;
String[] dnn;

View File

@@ -33,13 +33,13 @@
package android.hardware.radio.data;
/* @hide */
@JavaDerive(toString=true) @VintfStability
@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
parcelable SetupDataCallResult {
android.hardware.radio.data.DataCallFailCause cause;
android.hardware.radio.data.DataCallFailCause cause = android.hardware.radio.data.DataCallFailCause.NONE;
long suggestedRetryTime;
int cid;
int active;
android.hardware.radio.data.PdpProtocolType type;
android.hardware.radio.data.PdpProtocolType type = android.hardware.radio.data.PdpProtocolType.IP;
String ifname;
android.hardware.radio.data.LinkAddress[] addresses;
String[] dnses;

View File

@@ -33,8 +33,9 @@
package android.hardware.radio.ims.media;
/* @hide */
@Backing(type="int") @JavaDerive(toString=true) @VintfStability
@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
enum AmrMode {
INVALID = 0,
AMR_MODE_0 = (1 << 0) /* 1 */,
AMR_MODE_1 = (1 << 1) /* 2 */,
AMR_MODE_2 = (1 << 2) /* 4 */,

View File

@@ -35,7 +35,7 @@ package android.hardware.radio.ims.media;
/* @hide */
@JavaDerive(toString=true) @VintfStability
parcelable AmrParams {
android.hardware.radio.ims.media.AmrMode amrMode;
android.hardware.radio.ims.media.AmrMode amrMode = android.hardware.radio.ims.media.AmrMode.INVALID;
boolean octetAligned;
int maxRedundancyMillis;
}

View File

@@ -35,7 +35,7 @@ package android.hardware.radio.ims.media;
/* @hide */
@JavaDerive(toString=true) @VintfStability
parcelable CodecParams {
android.hardware.radio.ims.media.CodecType codecType;
android.hardware.radio.ims.media.CodecType codecType = android.hardware.radio.ims.media.CodecType.INVALID;
byte rxPayloadTypeNumber;
byte txPayloadTypeNumber;
byte samplingRateKHz;

View File

@@ -35,6 +35,7 @@ package android.hardware.radio.ims.media;
/* @hide */
@Backing(type="int") @JavaDerive(toString=true) @VintfStability
enum CodecType {
INVALID = 0,
AMR = (1 << 0) /* 1 */,
AMR_WB = (1 << 1) /* 2 */,
EVS = (1 << 2) /* 4 */,

View File

@@ -33,8 +33,9 @@
package android.hardware.radio.ims.media;
/* @hide */
@Backing(type="int") @JavaDerive(toString=true) @VintfStability
@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
enum EvsMode {
INVALID = 0,
EVS_MODE_0 = (1 << 0) /* 1 */,
EVS_MODE_1 = (1 << 1) /* 2 */,
EVS_MODE_2 = (1 << 2) /* 4 */,

View File

@@ -35,8 +35,8 @@ package android.hardware.radio.ims.media;
/* @hide */
@JavaDerive(toString=true) @VintfStability
parcelable EvsParams {
android.hardware.radio.ims.media.EvsBandwidth bandwidth;
android.hardware.radio.ims.media.EvsMode evsMode;
android.hardware.radio.ims.media.EvsBandwidth bandwidth = android.hardware.radio.ims.media.EvsBandwidth.NONE;
android.hardware.radio.ims.media.EvsMode evsMode = android.hardware.radio.ims.media.EvsMode.INVALID;
byte channelAwareMode;
boolean useHeaderFullOnly;
boolean useEvsModeSwitch;

View File

@@ -33,7 +33,7 @@
package android.hardware.radio.ims.media;
/* @hide */
@Backing(type="int") @JavaDerive(toString=true) @VintfStability
@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
enum RtcpXrReportBlockType {
RTCPXR_NONE = 0,
RTCPXR_LOSS_RLE_REPORT_BLOCK = (1 << 0) /* 1 */,

View File

@@ -36,7 +36,7 @@ package android.hardware.radio.ims.media;
@JavaDerive(toString=true) @VintfStability
parcelable RtpConfig {
int direction;
android.hardware.radio.AccessNetwork accessNetwork;
android.hardware.radio.AccessNetwork accessNetwork = android.hardware.radio.AccessNetwork.UNKNOWN;
android.hardware.radio.ims.media.RtpAddress remoteAddress;
android.hardware.radio.ims.media.RtpSessionParams sessionParams;
android.hardware.radio.ims.media.RtcpConfig rtcpConfig;

View File

@@ -35,11 +35,12 @@ package android.hardware.radio.ims;
/* @hide */
@JavaDerive(toString=true) @VintfStability
parcelable ConnectionFailureInfo {
android.hardware.radio.ims.ConnectionFailureInfo.ConnectionFailureReason failureReason;
android.hardware.radio.ims.ConnectionFailureInfo.ConnectionFailureReason failureReason = android.hardware.radio.ims.ConnectionFailureInfo.ConnectionFailureReason.INVALID;
int causeCode;
int waitTimeMillis;
@Backing(type="int") @VintfStability
@Backing(type="int") @SuppressWarnings(value={"redundant-name"}) @VintfStability
enum ConnectionFailureReason {
INVALID = 0,
REASON_ACCESS_DENIED = 1,
REASON_NAS_FAILURE = 2,
REASON_RACH_FAILURE = 3,

View File

@@ -36,10 +36,10 @@ package android.hardware.radio.ims;
@JavaDerive(toString=true) @VintfStability
parcelable ImsCall {
int index;
android.hardware.radio.ims.ImsCall.CallType callType;
android.hardware.radio.AccessNetwork accessNetwork;
android.hardware.radio.ims.ImsCall.CallState callState;
android.hardware.radio.ims.ImsCall.Direction direction;
android.hardware.radio.ims.ImsCall.CallType callType = android.hardware.radio.ims.ImsCall.CallType.NORMAL;
android.hardware.radio.AccessNetwork accessNetwork = android.hardware.radio.AccessNetwork.UNKNOWN;
android.hardware.radio.ims.ImsCall.CallState callState = android.hardware.radio.ims.ImsCall.CallState.ACTIVE;
android.hardware.radio.ims.ImsCall.Direction direction = android.hardware.radio.ims.ImsCall.Direction.INCOMING;
boolean isHeldByRemote;
@Backing(type="int")
enum CallType {

View File

@@ -33,7 +33,7 @@
package android.hardware.radio.ims;
/* @hide */
@Backing(type="int") @JavaDerive(toString=true) @VintfStability
@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
enum ImsDeregistrationReason {
REASON_SIM_REMOVED = 1,
REASON_SIM_REFRESH = 2,

View File

@@ -33,11 +33,11 @@
package android.hardware.radio.ims;
/* @hide */
@JavaDerive(toString=true) @VintfStability
@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
parcelable ImsRegistration {
android.hardware.radio.ims.ImsRegistrationState regState;
android.hardware.radio.AccessNetwork accessNetworkType;
android.hardware.radio.ims.SuggestedAction suggestedAction;
android.hardware.radio.ims.ImsRegistrationState regState = android.hardware.radio.ims.ImsRegistrationState.NOT_REGISTERED;
android.hardware.radio.AccessNetwork accessNetworkType = android.hardware.radio.AccessNetwork.UNKNOWN;
android.hardware.radio.ims.SuggestedAction suggestedAction = android.hardware.radio.ims.SuggestedAction.NONE;
int capabilities;
const int IMS_MMTEL_CAPABILITY_NONE = 0;
const int IMS_MMTEL_CAPABILITY_VOICE = (1 << 0) /* 1 */;

View File

@@ -36,10 +36,10 @@ package android.hardware.radio.ims;
@JavaDerive(toString=true) @VintfStability
parcelable SrvccCall {
int index;
android.hardware.radio.ims.SrvccCall.CallType callType;
android.hardware.radio.ims.SrvccCall.CallType callType = android.hardware.radio.ims.SrvccCall.CallType.NORMAL;
int callState;
android.hardware.radio.ims.SrvccCall.CallSubState callSubstate;
android.hardware.radio.ims.SrvccCall.ToneType ringbackToneType;
android.hardware.radio.ims.SrvccCall.CallSubState callSubstate = android.hardware.radio.ims.SrvccCall.CallSubState.NONE;
android.hardware.radio.ims.SrvccCall.ToneType ringbackToneType = android.hardware.radio.ims.SrvccCall.ToneType.NONE;
boolean isMpty;
boolean isMT;
String number;

View File

@@ -33,7 +33,7 @@
package android.hardware.radio.messaging;
/* @hide */
@JavaDerive(toString=true) @VintfStability
@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
parcelable CdmaSmsSubaddress {
int subaddressType;
boolean odd;

View File

@@ -35,7 +35,7 @@ package android.hardware.radio.messaging;
/* @hide */
@JavaDerive(toString=true) @VintfStability
parcelable ImsSmsMessage {
android.hardware.radio.RadioTechnologyFamily tech;
android.hardware.radio.RadioTechnologyFamily tech = android.hardware.radio.RadioTechnologyFamily.THREE_GPP;
boolean retry;
int messageRef;
android.hardware.radio.messaging.CdmaSmsMessage[] cdmaMessage;

View File

@@ -33,7 +33,7 @@
package android.hardware.radio.network;
/* @hide */
@JavaDerive(toString=true) @VintfStability
@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
parcelable BarringInfo {
int serviceType;
int barringType;

View File

@@ -36,6 +36,6 @@ package android.hardware.radio.network;
@JavaDerive(toString=true) @VintfStability
parcelable CellInfo {
boolean registered;
android.hardware.radio.network.CellConnectionStatus connectionStatus;
android.hardware.radio.network.CellConnectionStatus connectionStatus = android.hardware.radio.network.CellConnectionStatus.NONE;
android.hardware.radio.network.CellInfoRatSpecificInfo ratSpecificInfo;
}

View File

@@ -36,7 +36,7 @@ package android.hardware.radio.network;
@JavaDerive(toString=true) @VintfStability
parcelable CellularIdentifierDisclosure {
String plmn;
android.hardware.radio.network.CellularIdentifier identifier;
android.hardware.radio.network.NasProtocolMessage protocolMessage;
android.hardware.radio.network.CellularIdentifier identifier = android.hardware.radio.network.CellularIdentifier.UNKNOWN;
android.hardware.radio.network.NasProtocolMessage protocolMessage = android.hardware.radio.network.NasProtocolMessage.UNKNOWN;
boolean isEmergency;
}

View File

@@ -35,6 +35,7 @@ package android.hardware.radio.network;
/* @hide */
@Backing(type="int") @JavaDerive(toString=true) @VintfStability
enum Domain {
INVALID = 0,
CS = (1 << 0) /* 1 */,
PS = (1 << 1) /* 2 */,
}

View File

@@ -33,7 +33,7 @@
package android.hardware.radio.network;
/* @hide */
@Backing(type="int") @JavaDerive(toString=true) @VintfStability
@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
enum EmergencyMode {
EMERGENCY_WWAN = 1,
EMERGENCY_WLAN = 2,

View File

@@ -36,5 +36,5 @@ package android.hardware.radio.network;
@JavaDerive(toString=true) @VintfStability
parcelable EmergencyNetworkScanTrigger {
android.hardware.radio.AccessNetwork[] accessNetwork;
android.hardware.radio.network.EmergencyScanType scanType;
android.hardware.radio.network.EmergencyScanType scanType = android.hardware.radio.network.EmergencyScanType.NO_PREFERENCE;
}

View File

@@ -35,9 +35,9 @@ package android.hardware.radio.network;
/* @hide */
@JavaDerive(toString=true) @VintfStability
parcelable EmergencyRegResult {
android.hardware.radio.AccessNetwork accessNetwork;
android.hardware.radio.network.RegState regState;
android.hardware.radio.network.Domain emcDomain;
android.hardware.radio.AccessNetwork accessNetwork = android.hardware.radio.AccessNetwork.UNKNOWN;
android.hardware.radio.network.RegState regState = android.hardware.radio.network.RegState.NOT_REG_MT_NOT_SEARCHING_OP;
android.hardware.radio.network.Domain emcDomain = android.hardware.radio.network.Domain.INVALID;
boolean isVopsSupported;
boolean isEmcBearerSupported;
byte nwProvidedEmc;

View File

@@ -37,7 +37,7 @@ package android.hardware.radio.network;
parcelable EutranRegistrationInfo {
android.hardware.radio.network.LteVopsInfo lteVopsInfo;
android.hardware.radio.network.NrIndicators nrIndicators;
android.hardware.radio.network.EutranRegistrationInfo.AttachResultType lteAttachResultType;
android.hardware.radio.network.EutranRegistrationInfo.AttachResultType lteAttachResultType = android.hardware.radio.network.EutranRegistrationInfo.AttachResultType.NONE;
int extraInfo;
const int EXTRA_CSFB_NOT_PREFERRED = (1 << 0) /* 1 */;
const int EXTRA_SMS_ONLY = (1 << 1) /* 2 */;

View File

@@ -33,7 +33,7 @@
package android.hardware.radio.network;
/* @hide */
@JavaDerive(toString=true) @VintfStability
@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
parcelable NetworkScanRequest {
int type;
int interval;

View File

@@ -33,10 +33,10 @@
package android.hardware.radio.network;
/* @hide */
@JavaDerive(toString=true) @VintfStability
@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
parcelable NetworkScanResult {
int status;
android.hardware.radio.RadioError error;
android.hardware.radio.RadioError error = android.hardware.radio.RadioError.NONE;
android.hardware.radio.network.CellInfo[] networkInfos;
const int SCAN_STATUS_PARTIAL = 1;
const int SCAN_STATUS_COMPLETE = 2;

View File

@@ -33,7 +33,7 @@
package android.hardware.radio.network;
/* @hide */
@JavaDerive(toString=true) @VintfStability
@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
parcelable NrVopsInfo {
byte vopsSupported;
byte emcSupported;

View File

@@ -35,8 +35,8 @@ package android.hardware.radio.network;
/* @hide */
@JavaDerive(toString=true) @VintfStability
parcelable PhysicalChannelConfig {
android.hardware.radio.network.CellConnectionStatus status;
android.hardware.radio.RadioTechnology rat;
android.hardware.radio.network.CellConnectionStatus status = android.hardware.radio.network.CellConnectionStatus.NONE;
android.hardware.radio.RadioTechnology rat = android.hardware.radio.RadioTechnology.UNKNOWN;
int downlinkChannelNumber;
int uplinkChannelNumber;
int cellBandwidthDownlinkKhz;

View File

@@ -35,7 +35,7 @@ package android.hardware.radio.network;
/* @hide */
@JavaDerive(toString=true) @VintfStability
parcelable RadioAccessSpecifier {
android.hardware.radio.AccessNetwork accessNetwork;
android.hardware.radio.AccessNetwork accessNetwork = android.hardware.radio.AccessNetwork.UNKNOWN;
android.hardware.radio.network.RadioAccessSpecifierBands bands;
int[] channels;
}

View File

@@ -33,7 +33,7 @@
package android.hardware.radio.network;
/* @hide */
@Backing(type="int") @JavaDerive(toString=true) @VintfStability
@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
enum RadioBandMode {
BAND_MODE_UNSPECIFIED,
BAND_MODE_EURO,

View File

@@ -33,7 +33,7 @@
package android.hardware.radio.network;
/* @hide */
@Backing(type="int") @JavaDerive(toString=true) @VintfStability
@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
enum RegState {
NOT_REG_MT_NOT_SEARCHING_OP = 0,
REG_HOME = 1,

View File

@@ -35,9 +35,9 @@ package android.hardware.radio.network;
/* @hide */
@JavaDerive(toString=true) @VintfStability
parcelable RegStateResult {
android.hardware.radio.network.RegState regState;
android.hardware.radio.RadioTechnology rat;
android.hardware.radio.network.RegistrationFailCause reasonForDenial;
android.hardware.radio.network.RegState regState = android.hardware.radio.network.RegState.NOT_REG_MT_NOT_SEARCHING_OP;
android.hardware.radio.RadioTechnology rat = android.hardware.radio.RadioTechnology.UNKNOWN;
android.hardware.radio.network.RegistrationFailCause reasonForDenial = android.hardware.radio.network.RegistrationFailCause.NONE;
android.hardware.radio.network.CellIdentity cellIdentity;
String registeredPlmn;
android.hardware.radio.network.AccessTechnologySpecificInfo accessTechnologySpecificInfo;

View File

@@ -35,8 +35,8 @@ package android.hardware.radio.network;
/* @hide */
@JavaDerive(toString=true) @VintfStability
parcelable SecurityAlgorithmUpdate {
android.hardware.radio.network.ConnectionEvent connectionEvent;
android.hardware.radio.network.SecurityAlgorithm encryption;
android.hardware.radio.network.SecurityAlgorithm integrity;
android.hardware.radio.network.ConnectionEvent connectionEvent = android.hardware.radio.network.ConnectionEvent.CS_SIGNALLING_GSM;
android.hardware.radio.network.SecurityAlgorithm encryption = android.hardware.radio.network.SecurityAlgorithm.A50;
android.hardware.radio.network.SecurityAlgorithm integrity = android.hardware.radio.network.SecurityAlgorithm.A50;
boolean isUnprotectedEmergency;
}

View File

@@ -33,14 +33,14 @@
package android.hardware.radio.network;
/* @hide */
@JavaDerive(toString=true) @VintfStability
@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
parcelable SignalThresholdInfo {
int signalMeasurement;
int hysteresisMs;
int hysteresisDb;
int[] thresholds;
boolean isEnabled;
android.hardware.radio.AccessNetwork ran;
android.hardware.radio.AccessNetwork ran = android.hardware.radio.AccessNetwork.UNKNOWN;
const int SIGNAL_MEASUREMENT_TYPE_RSSI = 1;
const int SIGNAL_MEASUREMENT_TYPE_RSCP = 2;
const int SIGNAL_MEASUREMENT_TYPE_RSRP = 3;

View File

@@ -33,16 +33,16 @@
package android.hardware.radio.sim;
/* @hide */
@JavaDerive(toString=true) @VintfStability
@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
parcelable AppStatus {
int appType;
int appState;
android.hardware.radio.sim.PersoSubstate persoSubstate;
android.hardware.radio.sim.PersoSubstate persoSubstate = android.hardware.radio.sim.PersoSubstate.UNKNOWN;
String aidPtr;
String appLabelPtr;
boolean pin1Replaced;
android.hardware.radio.sim.PinState pin1;
android.hardware.radio.sim.PinState pin2;
android.hardware.radio.sim.PinState pin1 = android.hardware.radio.sim.PinState.UNKNOWN;
android.hardware.radio.sim.PinState pin2 = android.hardware.radio.sim.PinState.UNKNOWN;
const int APP_STATE_UNKNOWN = 0;
const int APP_STATE_DETECTED = 1;
const int APP_STATE_PIN = 2;

View File

@@ -33,7 +33,7 @@
package android.hardware.radio.sim;
/* @hide */
@Backing(type="int") @JavaDerive(toString=true) @VintfStability
@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
enum CardPowerState {
POWER_DOWN,
POWER_UP,

View File

@@ -36,7 +36,7 @@ package android.hardware.radio.sim;
@JavaDerive(toString=true) @VintfStability
parcelable CardStatus {
int cardState;
android.hardware.radio.sim.PinState universalPinState;
android.hardware.radio.sim.PinState universalPinState = android.hardware.radio.sim.PinState.UNKNOWN;
int gsmUmtsSubscriptionAppIndex;
int cdmaSubscriptionAppIndex;
int imsSubscriptionAppIndex;

View File

@@ -44,7 +44,7 @@ parcelable CarrierRestrictions {
*/
android.hardware.radio.sim.Carrier[] excludedCarriers;
boolean allowedCarriersPrioritized;
android.hardware.radio.sim.CarrierRestrictions.CarrierRestrictionStatus status;
android.hardware.radio.sim.CarrierRestrictions.CarrierRestrictionStatus status = android.hardware.radio.sim.CarrierRestrictions.CarrierRestrictionStatus.UNKNOWN;
android.hardware.radio.sim.CarrierInfo[] allowedCarrierInfoList = {};
android.hardware.radio.sim.CarrierInfo[] excludedCarrierInfoList = {};
@Backing(type="int") @VintfStability

View File

@@ -33,7 +33,7 @@
package android.hardware.radio.sim;
/* @hide */
@Backing(type="byte") @JavaDerive(toString=true) @VintfStability
@Backing(type="byte") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
enum PbReceivedStatus {
PB_RECEIVED_OK = 1,
PB_RECEIVED_ERROR = 2,

View File

@@ -33,7 +33,7 @@
package android.hardware.radio.sim;
/* @hide */
@Backing(type="int") @JavaDerive(toString=true) @VintfStability
@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
enum SimLockMultiSimPolicy {
NO_MULTISIM_POLICY,
ONE_VALID_SIM_MUST_BE_PRESENT,

View File

@@ -33,7 +33,7 @@
package android.hardware.radio.sim;
/* @hide */
@JavaDerive(toString=true) @VintfStability
@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
parcelable SimRefreshResult {
int type;
int efId;

View File

@@ -48,7 +48,7 @@ parcelable Call {
String name;
int namePresentation;
android.hardware.radio.voice.UusInfo[] uusInfo;
android.hardware.radio.voice.AudioQuality audioQuality;
android.hardware.radio.voice.AudioQuality audioQuality = android.hardware.radio.voice.AudioQuality.UNSPECIFIED;
String forwardedNumber;
const int PRESENTATION_ALLOWED = 0;
const int PRESENTATION_RESTRICTED = 1;

View File

@@ -33,7 +33,7 @@
package android.hardware.radio.voice;
/* @hide */
@JavaDerive(toString=true) @VintfStability
@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
parcelable CdmaDisplayInfoRecord {
String alphaBuf;
const int CDMA_ALPHA_INFO_BUFFER_LENGTH = 64;

View File

@@ -33,7 +33,7 @@
package android.hardware.radio.voice;
/* @hide */
@JavaDerive(toString=true) @VintfStability
@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
parcelable CdmaInformationRecord {
int name;
android.hardware.radio.voice.CdmaDisplayInfoRecord[] display;

View File

@@ -33,7 +33,7 @@
package android.hardware.radio.voice;
/* @hide */
@JavaDerive(toString=true) @VintfStability
@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
parcelable CdmaNumberInfoRecord {
String number;
byte numberType;

View File

@@ -33,7 +33,7 @@
package android.hardware.radio.voice;
/* @hide */
@JavaDerive(toString=true) @VintfStability
@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
parcelable CdmaRedirectingNumberInfoRecord {
android.hardware.radio.voice.CdmaNumberInfoRecord redirectingNumber;
int redirectingReason;

View File

@@ -33,7 +33,7 @@
package android.hardware.radio.voice;
/* @hide */
@Backing(type="int") @JavaDerive(toString=true) @VintfStability
@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
enum ClipStatus {
CLIP_PROVISIONED,
CLIP_UNPROVISIONED,

View File

@@ -33,7 +33,7 @@
package android.hardware.radio.voice;
/* @hide */
@Backing(type="int") @JavaDerive(toString=true) @VintfStability
@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
enum EmergencyCallRouting {
UNKNOWN,
EMERGENCY,

View File

@@ -33,8 +33,9 @@
package android.hardware.radio.voice;
/* @hide */
@Backing(type="int") @JavaDerive(toString=true) @VintfStability
@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
enum LastCallFailCause {
INVALID = 0,
UNOBTAINABLE_NUMBER = 1,
NO_ROUTE_TO_DESTINATION = 3,
CHANNEL_UNACCEPTABLE = 6,

View File

@@ -35,6 +35,6 @@ package android.hardware.radio.voice;
/* @hide */
@JavaDerive(toString=true) @VintfStability
parcelable LastCallFailCauseInfo {
android.hardware.radio.voice.LastCallFailCause causeCode;
android.hardware.radio.voice.LastCallFailCause causeCode = android.hardware.radio.voice.LastCallFailCause.INVALID;
String vendorCause;
}

View File

@@ -33,7 +33,7 @@
package android.hardware.radio.voice;
/* @hide */
@JavaDerive(toString=true) @VintfStability
@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
parcelable SsInfoData {
int[] ssInfo;
const int SS_INFO_MAX = 4;

View File

@@ -39,7 +39,7 @@ parcelable StkCcUnsolSsResult {
int requestType;
int teleserviceType;
int serviceClass;
android.hardware.radio.RadioError result;
android.hardware.radio.RadioError result = android.hardware.radio.RadioError.NONE;
android.hardware.radio.voice.SsInfoData[] ssInfo;
android.hardware.radio.voice.CfData[] cfData;
const int REQUEST_TYPE_ACTIVATION = 0;

View File

@@ -33,7 +33,7 @@
package android.hardware.radio.voice;
/* @hide */
@JavaDerive(toString=true) @VintfStability
@JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
parcelable UusInfo {
int uusType;
int uusDcs;

View File

@@ -33,7 +33,7 @@
package android.hardware.radio;
/* @hide */
@Backing(type="int") @JavaDerive(toString=true) @VintfStability
@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
enum RadioError {
NONE = 0,
RADIO_NOT_AVAILABLE = 1,

View File

@@ -35,7 +35,7 @@ package android.hardware.radio;
/* @hide */
@JavaDerive(toString=true) @VintfStability
parcelable RadioResponseInfo {
android.hardware.radio.RadioResponseType type;
android.hardware.radio.RadioResponseType type = android.hardware.radio.RadioResponseType.SOLICITED;
int serial;
android.hardware.radio.RadioError error;
android.hardware.radio.RadioError error = android.hardware.radio.RadioError.NONE;
}

View File

@@ -35,8 +35,8 @@ package android.hardware.radio;
/* @hide */
@JavaDerive(toString=true) @VintfStability
parcelable RadioResponseInfoModem {
android.hardware.radio.RadioResponseType type;
android.hardware.radio.RadioResponseType type = android.hardware.radio.RadioResponseType.SOLICITED;
int serial;
android.hardware.radio.RadioError error;
android.hardware.radio.RadioError error = android.hardware.radio.RadioError.NONE;
boolean isEnabled;
}

View File

@@ -20,6 +20,7 @@ package android.hardware.radio;
@VintfStability
@Backing(type="int")
@JavaDerive(toString=true)
@SuppressWarnings(value={"redundant-name"})
enum RadioError {
/**
* Success

View File

@@ -26,7 +26,7 @@ parcelable RadioResponseInfo {
/**
* Response type
*/
RadioResponseType type;
RadioResponseType type = RadioResponseType.SOLICITED;
/**
* Serial number of the request
*/
@@ -34,5 +34,5 @@ parcelable RadioResponseInfo {
/**
* Response error
*/
RadioError error;
RadioError error = RadioError.NONE;
}

View File

@@ -26,7 +26,7 @@ parcelable RadioResponseInfoModem {
/**
* Response type
*/
RadioResponseType type;
RadioResponseType type = RadioResponseType.SOLICITED;
/**
* Serial number of the request
*/
@@ -34,7 +34,7 @@ parcelable RadioResponseInfoModem {
/**
* Response error
*/
RadioError error;
RadioError error = RadioError.NONE;
/**
* Whether the modem is enabled or not
*/

View File

@@ -20,6 +20,7 @@ package android.hardware.radio.data;
@VintfStability
@Backing(type="int")
@JavaDerive(toString=true)
@SuppressWarnings(value={"redundant-name"})
enum DataCallFailCause {
/**
* An integer cause code defined in TS 24.008 section 6.1.3.1.3 or TS 24.301 Release 8+ Annex B.

View File

@@ -66,15 +66,15 @@ parcelable DataProfileInfo {
/**
* PDP_type values.
*/
PdpProtocolType protocol;
PdpProtocolType protocol = PdpProtocolType.IP;
/**
* PDP_type values used on roaming network.
*/
PdpProtocolType roamingProtocol;
PdpProtocolType roamingProtocol = PdpProtocolType.IP;
/**
* APN authentication type.
*/
ApnAuthType authType;
ApnAuthType authType = ApnAuthType.NO_PAP_NO_CHAP;
/**
* The username for APN, or empty string.
*/

View File

@@ -20,6 +20,7 @@ package android.hardware.radio.data;
@VintfStability
@Backing(type="byte")
@JavaDerive(toString=true)
@SuppressWarnings(value={"redundant-name"})
enum DataThrottlingAction {
/*
* Clear all existing data throttling.

View File

@@ -22,6 +22,7 @@ package android.hardware.radio.data;
*/
@VintfStability
@JavaDerive(toString=true)
@SuppressWarnings(value={"redundant-name"})
parcelable LinkAddress {
const int ADDRESS_PROPERTY_NONE = 0;
/**

View File

@@ -24,6 +24,7 @@ package android.hardware.radio.data;
*/
@VintfStability
@JavaDerive(toString=true)
@SuppressWarnings(value={"redundant-name"})
parcelable PortRange {
const int PORT_RANGE_MIN = 20;
const int PORT_RANGE_MAX = 65535;

View File

@@ -38,7 +38,7 @@ parcelable RouteSelectionDescriptor {
/**
* Valid values are IP, IPV6, IPV4V6, and UNKNOWN.
*/
PdpProtocolType sessionType;
PdpProtocolType sessionType = PdpProtocolType.IP;
/**
* Session and service continuity mode as defined in 3GPP TS 23.501.
* Valid values are SSC_MODE_

View File

@@ -27,6 +27,7 @@ import android.hardware.radio.data.TrafficDescriptor;
/** @hide */
@VintfStability
@JavaDerive(toString=true)
@SuppressWarnings(value={"redundant-name"})
parcelable SetupDataCallResult {
/**
* Indicates the data connection is inactive.
@@ -64,7 +65,7 @@ parcelable SetupDataCallResult {
/**
* Data call fail cause. DataCallFailCause.NONE if no error.
*/
DataCallFailCause cause;
DataCallFailCause cause = DataCallFailCause.NONE;
/**
* If cause is not DataCallFailCause.NONE, this field indicates the network suggested data
* retry back-off time in milliseconds. Negative value indicates network does not give any
@@ -87,7 +88,7 @@ parcelable SetupDataCallResult {
* PDP protocol type. If cause is DataCallFailCause.ONLY_SINGLE_BEARER_ALLOWED, this is the
* protocol type supported, such as "IP" or "IPV6".
*/
PdpProtocolType type;
PdpProtocolType type = PdpProtocolType.IP;
/**
* The network interface name.
*/

View File

@@ -22,7 +22,10 @@ package android.hardware.radio.ims;
parcelable ConnectionFailureInfo {
@VintfStability
@Backing(type="int")
@SuppressWarnings(value={"redundant-name"})
enum ConnectionFailureReason {
/** Do not use. */
INVALID = 0,
/** Access class check failed */
REASON_ACCESS_DENIED = 1,
/** 3GPP Non-access stratum failure */
@@ -47,7 +50,7 @@ parcelable ConnectionFailureInfo {
/**
* Values are REASON_* constants
*/
ConnectionFailureReason failureReason;
ConnectionFailureReason failureReason = ConnectionFailureReason.INVALID;
/**
* Failure cause code from network or modem specific to the failure

View File

@@ -50,16 +50,16 @@ parcelable ImsCall {
int index;
/** The type of the call */
CallType callType;
CallType callType = CallType.NORMAL;
/** The access network where the call is in progress */
AccessNetwork accessNetwork;
AccessNetwork accessNetwork = AccessNetwork.UNKNOWN;
/** The state of the call */
CallState callState;
CallState callState = CallState.ACTIVE;
/** The direction of the call */
Direction direction;
Direction direction = Direction.INCOMING;
/** True if the call is put on HOLD by the other party */
boolean isHeldByRemote;

View File

@@ -20,6 +20,7 @@ package android.hardware.radio.ims;
@VintfStability
@JavaDerive(toString=true)
@Backing(type="int")
@SuppressWarnings(value={"redundant-name"})
enum ImsDeregistrationReason {
/**
* Radio shall send this reason to IMS stack to perform graceful de-registration

View File

@@ -23,6 +23,7 @@ import android.hardware.radio.ims.SuggestedAction;
/** @hide */
@VintfStability
@JavaDerive(toString=true)
@SuppressWarnings(value={"redundant-name"})
parcelable ImsRegistration {
/** Default value */
const int IMS_MMTEL_CAPABILITY_NONE = 0;
@@ -36,15 +37,15 @@ parcelable ImsRegistration {
const int IMS_RCS_CAPABILITIES = 1 << 3;
/** Indicates the current IMS registration state. */
ImsRegistrationState regState;
ImsRegistrationState regState = ImsRegistrationState.NOT_REGISTERED;
/**
* Indicates the type of the radio access network where IMS is registered.
*/
AccessNetwork accessNetworkType;
AccessNetwork accessNetworkType = AccessNetwork.UNKNOWN;
/** Indicates the expected action for the radio to do. */
SuggestedAction suggestedAction;
SuggestedAction suggestedAction = SuggestedAction.NONE;
/**
* Values are bitwise ORs of IMS_MMTEL_CAPABILITY_* constants and IMS_RCS_CAPABILITIES.

View File

@@ -47,16 +47,16 @@ parcelable SrvccCall {
int index;
/** The type of the call */
CallType callType;
CallType callType = CallType.NORMAL;
/** Values are android.hardware.radio.voice.Call.STATE_* constants */
int callState;
/** The substate of the call */
CallSubState callSubstate;
CallSubState callSubstate = CallSubState.NONE;
/** The type of the ringback tone */
ToneType ringbackToneType;
ToneType ringbackToneType = ToneType.NONE;
/** true if is mpty call */
boolean isMpty;

View File

@@ -23,7 +23,10 @@ package android.hardware.radio.ims.media;
@VintfStability
@Backing(type="int")
@JavaDerive(toString=true)
@SuppressWarnings(value={"redundant-name"})
enum AmrMode {
/** Do not use. */
INVALID = 0,
/** 4.75 kbps for AMR / 6.6 kbps for AMR-WB */
AMR_MODE_0 = 1 << 0,
/** 5.15 kbps for AMR / 8.855 kbps for AMR-WB */

View File

@@ -23,7 +23,7 @@ import android.hardware.radio.ims.media.AmrMode;
@JavaDerive(toString=true)
parcelable AmrParams {
/** mode-set: AMR codec mode to represent the bit rate */
AmrMode amrMode;
AmrMode amrMode = AmrMode.INVALID;
/**
* octet-align: If it's set to true then all fields in the AMR/AMR-WB header
* shall be aligned to octet boundaries by adding padding bits.

View File

@@ -24,7 +24,7 @@ import android.hardware.radio.ims.media.CodecType;
@JavaDerive(toString=true)
parcelable CodecParams {
/** Negotiated codec type */
CodecType codecType;
CodecType codecType = CodecType.INVALID;
/**
* Static or dynamic payload type number negotiated through the SDP for
* the incoming RTP packets. This value shall be matched with the PT value

View File

@@ -21,6 +21,8 @@ package android.hardware.radio.ims.media;
@Backing(type="int")
@JavaDerive(toString=true)
enum CodecType {
/** Do not use. */
INVALID = 0,
/** Adaptive Multi-Rate */
AMR = 1 << 0,
/** Adaptive Multi-Rate Wide Band */

View File

@@ -23,7 +23,10 @@ package android.hardware.radio.ims.media;
@VintfStability
@Backing(type="int")
@JavaDerive(toString=true)
@SuppressWarnings(value={"redundant-name"})
enum EvsMode {
/** Do not use. */
INVALID = 0,
/** 6.6 kbps for EVS AMR-WB IO */
EVS_MODE_0 = 1 << 0,
/** 8.855 kbps for AMR-WB IO */

View File

@@ -24,10 +24,10 @@ import android.hardware.radio.ims.media.EvsMode;
@JavaDerive(toString=true)
parcelable EvsParams {
/** EVS codec bandwidth */
EvsBandwidth bandwidth;
EvsBandwidth bandwidth = EvsBandwidth.NONE;
/** mode-set: EVS codec mode to represent the bit rate */
EvsMode evsMode;
EvsMode evsMode = EvsMode.INVALID;
/**
* ch-aw-recv: Channel aware mode for the receive direction. Permissible values
* are -1, 0, 2, 3, 5, and 7. If -1, channel-aware mode is disabled in the

View File

@@ -23,6 +23,7 @@ package android.hardware.radio.ims.media;
@VintfStability
@Backing(type="int")
@JavaDerive(toString=true)
@SuppressWarnings(value={"redundant-name"})
enum RtcpXrReportBlockType {
/** Disable RTCP XR */
RTCPXR_NONE = 0,

View File

@@ -29,7 +29,7 @@ parcelable RtpConfig {
/** Media flow direction. The bitfield of MediaDirection(s) */
int direction;
/** Radio Access Network */
AccessNetwork accessNetwork;
AccessNetwork accessNetwork = AccessNetwork.UNKNOWN;
/** IP address and port number of the other party for RTP media */
RtpAddress remoteAddress;
/** Negotiated session parameters */

View File

@@ -19,6 +19,7 @@ package android.hardware.radio.messaging;
/** @hide */
@VintfStability
@JavaDerive(toString=true)
@SuppressWarnings(value={"redundant-name"})
parcelable CdmaSmsSubaddress {
/**
* CCITT X.213 or ISO 8348 AD2

View File

@@ -24,7 +24,7 @@ import android.hardware.radio.messaging.GsmSmsMessage;
@VintfStability
@JavaDerive(toString=true)
parcelable ImsSmsMessage {
RadioTechnologyFamily tech;
RadioTechnologyFamily tech = RadioTechnologyFamily.THREE_GPP;
/**
* Retry if true
*/

View File

@@ -21,6 +21,7 @@ import android.hardware.radio.network.BarringTypeSpecificInfo;
/** @hide */
@VintfStability
@JavaDerive(toString=true)
@SuppressWarnings(value={"redundant-name"})
parcelable BarringInfo {
/**
* Device is not barred for the given service

View File

@@ -30,6 +30,6 @@ parcelable CellInfo {
/**
* Connection status for the cell.
*/
CellConnectionStatus connectionStatus;
CellConnectionStatus connectionStatus = CellConnectionStatus.NONE;
CellInfoRatSpecificInfo ratSpecificInfo;
}

View File

@@ -31,9 +31,9 @@ parcelable CellularIdentifierDisclosure {
// The PLMN-ID to which the UE transmitted the cellular identifier
String plmn;
// The type of cellular identifier that was disclosed
CellularIdentifier identifier;
CellularIdentifier identifier = CellularIdentifier.UNKNOWN;
// The NAS protocol message within which the cellular identifier was transmitted.
NasProtocolMessage protocolMessage;
NasProtocolMessage protocolMessage = NasProtocolMessage.UNKNOWN;
// Whether or not this cellular identifier disclosure is in service of an emergency call.
boolean isEmergency;
}

View File

@@ -21,6 +21,8 @@ package android.hardware.radio.network;
@Backing(type="int")
@JavaDerive(toString=true)
enum Domain {
/** Do not use. */
INVALID = 0,
/**
* Circuit-switched
*/

View File

@@ -20,6 +20,7 @@ package android.hardware.radio.network;
@VintfStability
@Backing(type="int")
@JavaDerive(toString=true)
@SuppressWarnings(value={"redundant-name"})
enum EmergencyMode {
/**
* Mode Type Emergency WWAN, indicates that the current domain selected for the Emergency call

View File

@@ -32,5 +32,5 @@ parcelable EmergencyNetworkScanTrigger {
* Scan type indicates the type of scans to be performed i.e. limited scan, full service scan or
* any scan.
*/
EmergencyScanType scanType;
EmergencyScanType scanType = EmergencyScanType.NO_PREFERENCE;
}

View File

@@ -26,17 +26,17 @@ parcelable EmergencyRegResult {
/**
* Indicates the cellular access network of the current emergency capable system.
*/
AccessNetwork accessNetwork;
AccessNetwork accessNetwork = AccessNetwork.UNKNOWN;
/**
* Registration state of the current emergency capable system.
*/
RegState regState;
RegState regState = RegState.NOT_REG_MT_NOT_SEARCHING_OP;
/**
* EMC domain indicates the current domain of the acquired system.
*/
Domain emcDomain;
Domain emcDomain = Domain.INVALID;
/**
* This indicates whether the network supports voice over PS network.

View File

@@ -54,7 +54,7 @@ parcelable EutranRegistrationInfo {
* The type of network attachment. This info is valid only on LTE network and must be present
* when device has attached to the network.
*/
AttachResultType lteAttachResultType;
AttachResultType lteAttachResultType = AttachResultType.NONE;
/** Values are bitwise ORs of EXTRA_* constants */
int extraInfo;

View File

@@ -503,7 +503,7 @@ oneway interface IRadioNetwork {
*
* This is available when android.hardware.telephony is defined.
*/
oneway void setUsageSetting(in int serial, in UsageSetting usageSetting);
void setUsageSetting(in int serial, in UsageSetting usageSetting);
/**
* Get the UE usage setting for data/voice centric usage.
@@ -514,7 +514,7 @@ oneway interface IRadioNetwork {
*
* This is available when android.hardware.telephony is defined.
*/
oneway void getUsageSetting(in int serial);
void getUsageSetting(in int serial);
/**
* Set the Emergency Mode

View File

@@ -603,7 +603,7 @@ oneway interface IRadioNetworkResponse {
* RadioError:INTERNAL_ERR
* RadioError:SIM_ABSENT
*/
oneway void setUsageSettingResponse(in RadioResponseInfo info);
void setUsageSettingResponse(in RadioResponseInfo info);
/**
* @param info Response info struct containing response type, serial no. and error.
@@ -617,7 +617,7 @@ oneway interface IRadioNetworkResponse {
* RadioError:INTERNAL_ERR
* RadioError:SIM_ABSENT
*/
oneway void getUsageSettingResponse(in RadioResponseInfo info, in UsageSetting usageSetting);
void getUsageSettingResponse(in RadioResponseInfo info, in UsageSetting usageSetting);
/**
* Response of setEmergencyMode.

View File

@@ -21,6 +21,7 @@ import android.hardware.radio.network.RadioAccessSpecifier;
/** @hide */
@VintfStability
@JavaDerive(toString=true)
@SuppressWarnings(value={"redundant-name"})
parcelable NetworkScanRequest {
const int RADIO_ACCESS_SPECIFIER_MAX_SIZE = 8;

Some files were not shown because too many files have changed in this diff Show More