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

Commit 990a5f11 authored by Steven Moreland's avatar Steven Moreland
Browse files

Resolve differences in IRadio 

Test: branches are the same
Bug: 62999900
Change-Id: I67fe8b95ab81638563faba6fff43e5f60dc2aca5
(cherry picked from commit 0255501b)
parent 5f8cc4e6

radio/1.1/types.hal

+20 −20
Original line number Diff line number Diff line
@@ -176,26 +176,6 @@ struct NetworkScanResult { 
    vec<CellInfo> networkInfos;             // List of network information as CellInfo

};



struct ImsiEncryptionInfo {

    string mcc;                   // MCC of the Carrier.

    string mnc;                   // MNC of the Carrier.

    vec<uint8_t> carrierKey;      // Carrier specific key to be used for encryption. It must

                                  // be opaque to the framework. This is the byte-stream

                                  // representation of the key. This is an external encoded

                                  // form for the key used when a standard representation of

                                  // the key is needed outside the Java Virtual Machine, as

                                  // when transmitting the key to some other party.

                                  // The key is encoded according to a standard format

                                  // (such as X.509 SubjectPublicKeyInfo or PKCS#8), and is

                                  // returned using the getEncoded method as defined on the

                                  // java.security.Key interface.

    string keyIdentifier;         // This is an opaque value we're given by the carrier

                                  // and is returned to the carrier. This is used by the server to

                                  // help it locate the private key to decrypt the permanent

                                  // identity.

    int64_t expirationTime;       // date-time in UTC when the key will expire.

};



struct KeepaliveRequest {

    KeepaliveType type;                     // The format of the keepalive packet

    vec<uint8_t> sourceAddress;             // source address with type = family, in network
@@ -216,3 +196,23 @@ struct KeepaliveStatus { 
    int32_t sessionHandle;                  // the sessionHandle provided by the api

    KeepaliveStatusCode code;               // status for the given keepalive

};



struct ImsiEncryptionInfo {

    string mcc;                   // MCC of the Carrier.

    string mnc;                   // MNC of the Carrier.

    vec<uint8_t> carrierKey;      // Carrier specific key to be used for encryption. It must

                                  // be opaque to the framework. This is the byte-stream

                                  // representation of the key. This is an external encoded

                                  // form for the key used when a standard representation of

                                  // the key is needed outside the Java Virtual Machine, as

                                  // when transmitting the key to some other party.

                                  // The key is encoded according to a standard format

                                  // (such as X.509 SubjectPublicKeyInfo or PKCS#8), and is

                                  // returned using the getEncoded method as defined on the

                                  // java.security.Key interface.

    string keyIdentifier;         // This is an opaque value we're given by the carrier

                                  // and is returned to the carrier. This is used by the server to

                                  // help it locate the private key to decrypt the permanent

                                  // identity.

    int64_t expirationTime;       // date-time in UTC when the key will expire.

};