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

Commit cca4aa5b authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Fixed typos and incorrect types

am: f346766c

Change-Id: I1f768df471c89783b783684d77fa8f5c6f47b476
parents ca138816 f346766c
Loading
Loading
Loading
Loading
+348 −348
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ enum PersoSubstate : int32_t {
};

enum RadioState : int32_t {
    OFF = 0,                              // Radio explictly powered off (eg CFUN=0)
    OFF = 0,                              // Radio explicitly powered off (eg CFUN=0)
    UNAVAILABLE = 1,                      // Radio unavailable (eg, resetting or not booted)
    ON = 10,                              // Radio is ON
};
@@ -239,17 +239,17 @@ enum SapConnectRsp : int32_t {
    CONNECT_FAILURE,
    MSG_SIZE_TOO_LARGE,
    MSG_SIZE_TOO_SMALL,
    CONNECT_OK_CALL_ONGOING
    CONNECT_OK_CALL_ONGOING,
};

enum SapDisconnectType : int32_t {
    GRACEFUL,
    IMMEDIATE
    IMMEDIATE,
};

enum SapApduType : int32_t {
    APDU,
    APDU7816
    APDU7816,
};

enum SapResultCode : int32_t {
@@ -260,7 +260,7 @@ enum SapResultCode : int32_t {
    CARD_REMOVED,
    CARD_ALREADY_POWERED_ON,
    DATA_NOT_AVAILABLE,
    NOT_SUPPORTED
    NOT_SUPPORTED,
};

enum SapStatus : int32_t {
@@ -269,12 +269,12 @@ enum SapStatus : int32_t {
    CARD_NOT_ACCESSIBLE,
    CARD_REMOVED,
    CARD_INSERTED,
    RECOVERED
    RECOVERED,
};

enum SapTransferProtocol : int32_t {
    T0,
    T1
    T1,
};

enum CallState : int32_t {
@@ -308,7 +308,7 @@ enum UusDcs : int32_t {
    USP,                                  // User specified protocol
    OSIHLP,                               // OSI higher layer protocol
    X244,                                 // X.244
    RMCF,                                 // Reserved for system mangement convergence function
    RMCF,                                 // Reserved for system management convergence function
    IA5C,                                 // IA5 characters
};

@@ -513,7 +513,7 @@ enum RegState : int32_t {
                                          // emergency calls are enabled.
    REG_DENIED_EM,                        // Same as REG_DENIED but indicates that
                                          // emergency calls are enabled.
    UNKNOWN_EM                            // Same as UNKNOWN but indicates that
    UNKNOWN_EM,                           // Same as UNKNOWN but indicates that
                                          // emergency calls are enabled.
};

@@ -551,7 +551,7 @@ enum DataProfile : int32_t {
};

enum SmsAcknowledgeFailCause : int32_t {
    MEMORY_CAPAPCITY_EXCEEDED = 0xD3,
    MEMORY_CAPACITY_EXCEEDED = 0xD3,
    UNSPECIFIED_ERROR = 0XFF,
};

@@ -566,7 +566,7 @@ enum CallForwardInfoStatus : int32_t {
enum ClipStatus : int32_t {
    CLIP_PROVISIONED,                     // CLIP provisioned
    CLIP_UNPROVISIONED,                   // CLIP not provisioned
    UNKOWN,                               // unknown, e.g. no network etc
    UNKNOWN,                              // unknown, e.g. no network etc
};

enum SmsWriteArgsStatus : int32_t {
@@ -709,7 +709,7 @@ enum NvItem : int32_t {
enum ResetNvType : int32_t {
    RELOAD,                               // reload all NV items
    ERASE,                                // erase NV reset (SCRTN)
    FACORY_RESET,                        // factory reset (RTN)
    FACTORY_RESET,                        // factory reset (RTN)
};

enum HardwareConfigType : int32_t {
@@ -850,14 +850,14 @@ enum RadioCapabilityPhase : int32_t {
    APPLY      = 2,                       // APPLY is sent after all LM's receive START and returned
                                          // RadioCapability.status = 0. If any START's fail, hal
                                          // implementation must not send APPLY.
    UNSOL_RSP  = 3,                      // UNSOL_RSP is sent with unsol radioCapability()
    UNSOL_RSP  = 3,                       // UNSOL_RSP is sent with unsolicited radioCapability()
    FINISH     = 4                        // FINISH is sent after all commands have completed. If an
                                          // error occurs in any previous command, the
                                          // RadioAccessesFamily and logicalModemUuid fields must be
                                         // the prior configuration thus restoring the configuration
                                         // to the previous value. An error returned by FINISH
                                         // will generally be ignored or may cause that logical
                                         // modem to be removed from service.
                                          // the prior configuration thus restoring the
                                          // configuration to the previous value. An error returned
                                          // by FINISH will generally be ignored or may cause that
                                          // logical modem to be removed from service.
};

enum RadioCapabilityStatus : int32_t {
@@ -1193,7 +1193,7 @@ struct LteSignalStrength {
};

struct TdScdmaSignalStrength {
    uint32_t rscp;                        // The Received Signal Code Power in dBm multipled by -1.
    uint32_t rscp;                        // The Received Signal Code Power in dBm multiplied by -1.
                                          // Range : 25 to 120
                                          // INT_MAX: 0x7FFFFFFF denotes invalid value.
                                          // Reference: 3GPP TS 25.123, section 9.1.1.1
@@ -1222,7 +1222,7 @@ struct SetupDataCallResult {
    int32_t suggestedRetryTime;           // If status != 0, this fields indicates the suggested
                                          // retry back-off timer value RIL wants to override the
                                          // one pre-configured in FW.
                                          // The unit is miliseconds.
                                          // The unit is milliseconds.
                                          // The value < 0 means no value is suggested.
                                          // The value 0 means retry must be done ASAP.
                                          // The value of INT_MAX(0x7fffffff) means no retry.
@@ -1260,7 +1260,7 @@ struct IccIo {
    int32_t command;                      // one of the commands listed for TS 27.007 +CRSM
    int32_t fileId;                       // EF id
    string path;                          // "pathid" from TS 27.007 +CRSM command.
                                          // Path is in hex asciii format eg "7f205f70"
                                          // Path is in hex ascii format eg "7f205f70"
                                          // Path must always be provided.
    int32_t p1;                           // Values of p1, p2 and p3 defined as per 3GPP TS 51.011
    int32_t p2;
@@ -1379,7 +1379,7 @@ struct DataRegStateResult {
    int32_t reasonDataDenied;             // if registration state is 3 (Registration
                                          // denied) this is an enumerated reason why
                                          // registration was denied. See 3GPP TS 24.008,
                                          // Annex G.6 "Additonal cause codes for GMM".
                                          // Annex G.6 "Additional cause codes for GMM".
                                          // 7 == GPRS services not allowed
                                          // 8 == GPRS services and non-GPRS services not allowed
                                          // 9 == MS identity cannot be derived by the network
@@ -1409,7 +1409,7 @@ struct CallForwardInfo {
    int32_t serviceClass;                 // From 27.007 +CCFC/+CLCK "class"
                                          // See table for Android mapping from
                                          // MMI service code
                                          // 0 means user doesnt input class
                                          // 0 means user doesn't input class
    int32_t toa;                          // "type" from TS 27.007 7.11
    string number;                        // "number" from TS 27.007 7.11.
    int32_t timeSeconds;
@@ -1446,14 +1446,14 @@ struct CdmaSmsAddress {
                                          // numberOfDigits = number of digits
                                          // digits = ASCII digits, e.g. '1', '2', '3', '4', and '5'
    CdmaSmsNumberPlan numberPlan;         // Used only when digitMode is 8-bit
    vec<uint8_t> digits;                 // Each byte in this array represents a 4 bit or 8-bit digit
                                         // of address data
    vec<uint8_t> digits;                  // Each byte in this array represents a 4 bit or 8-bit
                                          // digit of address data
};

struct CdmaSmsSubaddress {
    CdmaSmsSubaddressType subaddressType;
    bool odd;                             // true means the last byte's lower 4 bits must be ignored
    vec<uint8_t> digits;                 // Each byte respresents an 8-bit digit of subaddress data
    vec<uint8_t> digits;                  // Each byte represents an 8-bit digit of subaddress data
};

struct CdmaSmsMessage {
@@ -1541,7 +1541,7 @@ struct CellIdentityWcdma {
struct CellIdentityCdma {
    int32_t networkId;                    // Network Id 0..65535, INT_MAX if unknown
    int32_t systemId;                     // CDMA System Id 0..32767, INT_MAX if unknown
    int32_t basestationId;               // Base Station Id 0..65535, INT_MAX if unknown
    int32_t baseStationId;                // Base Station Id 0..65535, INT_MAX if unknown
    int32_t longitude;                    // Longitude is a decimal number as specified in
                                          // 3GPP2 C.S0005-A v6.0. It is represented in units of
                                          // 0.25 seconds and ranges from -2592000 to 2592000,
@@ -1611,7 +1611,8 @@ struct CellInfo {
    uint64_t timeStamp;                   // Time in nanos as returned by ril_nano_time
    // Only one of the below vectors must be of size 1 based on the CellInfoType and others must be
    // of size 0
    vec<CellInfoGsm> gsm;                // Valid only if type = gsm and size = 1 else must be empty
    vec<CellInfoGsm> gsm;                 // Valid only if type = gsm and size = 1 else must be
                                          // empty
    vec<CellInfoCdma> cdma;               // Valid only if type = cdma and size = 1 else must be
                                          // empty
    vec<CellInfoLte> lte;                 // Valid only if type = lte and size = 1 else must be
@@ -1634,7 +1635,7 @@ struct ImsSmsMessage {
    RadioTechnologyFamily tech;
    bool retry;                           // false == not retry, true == retry */
    int32_t messageRef;                   // Valid field if retry is set to true.
                                         // Contains messageRef from SendSmsResult stuct
                                          // Contains messageRef from SendSmsResult struct
                                          // corresponding to failed MO SMS.
    // Only one of the below vectors must be of size 1 based on the RadioTechnologyFamily and others
    // must be of size 0
@@ -1680,15 +1681,14 @@ struct HardwareConfigModem {
};

struct HardwareConfigSim {
    string modemUuid;                   // RadioConst:MAX_UUID_LENGTH is max length of the
                                        // string
    string modemUuid;                     // RadioConst:MAX_UUID_LENGTH is max length of the string
};

struct HardwareConfig {
    HardwareConfigType type;
    string uuid;                         // RadioConst:MAX_UUID_LENGTH is max length of the
                                         // string
    string uuid;                          // RadioConst:MAX_UUID_LENGTH is max length of the string
    HardwareConfigState state;

    // Only one of the below vectors must have size = 1 based on the HardwareConfigType and other
    // must have size = 0.
    vec<HardwareConfigModem> modem;       // Valid only if type is Modem and size = 1 else must be
@@ -1719,7 +1719,7 @@ struct RadioCapability {
    int32_t session;                      // Unique session value defined by framework returned in
                                          // all "responses/unsol"
    RadioCapabilityPhase phase;
    RadioAccessFamily raf;
    bitfield<RadioAccessFamily> raf;      // 32-bit bitmap of RadioAccessFamily
    string logicalModemUuid;              // A UUID typically "com.xxxx.lmX where X is the logical
                                          // modem. RadioConst:MAX_UUID_LENGTH is the max
                                          // length
@@ -1817,7 +1817,7 @@ struct CdmaCallWaiting {
    string name;                          // Remote party name
    CdmaSignalInfoRecord signalInfoRecord;
    // Number type/Number plan required to support International Call Waiting
    CdmaCallWaitingNumberType numbertype;
    CdmaCallWaitingNumberType numberType;
    CdmaCallWaitingNumberPlan numberPlan;
};

@@ -1909,10 +1909,10 @@ struct StkCcUnsolSsResult {
    SsServiceType serviceType;
    SsRequestType requestType;
    SsTeleserviceType teleserviceType;
    SuppServiceClass serviceClass;
    bitfield<SuppServiceClass> serviceClass;
    RadioError result;
    // Only one of the below vectors may contain values and other must be empty
    vec<SsInfoData> ssInfo;              // Valid only for all SsserviceType except
    vec<SsInfoData> ssInfo;               // Valid only for all SsServiceType except
                                          // SsServiceType:CF_* else empty.
    vec<CfData> cfData;                   // Valid for SsServiceType:CF_* else empty
};