Merge "Resolve differences in IRadio" (1a2eb813) · Commits · e / os / android_hardware_interfaces

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.
		};