Merge "Create IRadio modules" (f3a521fb) · Commits · e / os / android_hardware_interfaces

compatibility_matrices/compatibility_matrix.current.xml

+52 −2

Original line number	Diff line number	Diff line
		@@ -414,10 +414,60 @@
		</interface>
		</hal>
		<hal format="aidl" optional="true">
		<name>android.hardware.radio</name>
		<name>android.hardware.radio.data</name>
		<version>1</version>
		<interface>
		<name>IRadio</name>
		<name>IRadioData</name>
		<instance>slot1</instance>
		<instance>slot2</instance>
		<instance>slot3</instance>
		</interface>
		</hal>
		<hal format="aidl" optional="true">
		<name>android.hardware.radio.messaging</name>
		<version>1</version>
		<interface>
		<name>IRadioMessaging</name>
		<instance>slot1</instance>
		<instance>slot2</instance>
		<instance>slot3</instance>
		</interface>
		</hal>
		<hal format="aidl" optional="true">
		<name>android.hardware.radio.modem</name>
		<version>1</version>
		<interface>
		<name>IRadioModem</name>
		<instance>slot1</instance>
		<instance>slot2</instance>
		<instance>slot3</instance>
		</interface>
		</hal>
		<hal format="aidl" optional="true">
		<name>android.hardware.radio.network</name>
		<version>1</version>
		<interface>
		<name>IRadioNetwork</name>
		<instance>slot1</instance>
		<instance>slot2</instance>
		<instance>slot3</instance>
		</interface>
		</hal>
		<hal format="aidl" optional="true">
		<name>android.hardware.radio.sim</name>
		<version>1</version>
		<interface>
		<name>IRadioSim</name>
		<instance>slot1</instance>
		<instance>slot2</instance>
		<instance>slot3</instance>
		</interface>
		</hal>
		<hal format="aidl" optional="true">
		<name>android.hardware.radio.voice</name>
		<version>1</version>
		<interface>
		<name>IRadioVoice</name>
		<instance>slot1</instance>
		<instance>slot2</instance>
		<instance>slot3</instance>

compatibility_matrices/exclude/fcm_exclude.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ bool ShouldCheckMissingHalsInFcm(const std::string& package) {
		"android.hardware.common.fmq",
		"android.hardware.graphics.common",
		"android.hardware.keymaster",
		"android.hardware.radio",

		// Fastboot HAL is only used by recovery. Recovery is owned by OEM. Framework
		// does not depend on this HAL, hence it is not declared in any manifests or matrices.

radio/aidl/Android.bp

+121 −27

Original line number	Diff line number	Diff line
		@@ -27,34 +27,128 @@ aidl_interface {
		},
		}

		cc_library {
		name: "android.hardware.radio-translate-ndk",
		aidl_interface {
		name: "android.hardware.radio.data",
		vendor_available: true,
		srcs: ["android/hardware/radio/data/*.aidl"],
		stability: "vintf",
		imports: ["android.hardware.radio"],
		backend: {
		cpp: {
		enabled: false,
		},
		java: {
		sdk_version: "module_current",
		},
		ndk: {
		vndk: {
		enabled: true,
		},
		},
		},
		}

		aidl_interface {
		name: "android.hardware.radio.messaging",
		vendor_available: true,
		srcs: ["android/hardware/radio/messaging/*.aidl"],
		stability: "vintf",
		imports: ["android.hardware.radio"],
		backend: {
		cpp: {
		enabled: false,
		},
		java: {
		sdk_version: "module_current",
		},
		ndk: {
		vndk: {
		enabled: true,
		},
		},
		},
		}

		aidl_interface {
		name: "android.hardware.radio.modem",
		vendor_available: true,
		srcs: ["android/hardware/radio/modem/*.aidl"],
		stability: "vintf",
		imports: ["android.hardware.radio"],
		backend: {
		cpp: {
		enabled: false,
		},
		java: {
		sdk_version: "module_current",
		},
		ndk: {
		vndk: {
		enabled: true,
		},
		},
		},
		}

		aidl_interface {
		name: "android.hardware.radio.network",
		vendor_available: true,
		shared_libs: [
		"libbinder_ndk",
		"libhidlbase",
		"android.hardware.radio-V1-ndk_platform",
		"android.hardware.radio@1.0",
		"android.hardware.radio@1.1",
		"android.hardware.radio@1.2",
		"android.hardware.radio@1.3",
		"android.hardware.radio@1.4",
		"android.hardware.radio@1.5",
		"android.hardware.radio@1.6",
		],
		srcs: ["android/hardware/radio/network/*.aidl"],
		stability: "vintf",
		imports: ["android.hardware.radio"],
		backend: {
		cpp: {
		enabled: false,
		},
		java: {
		sdk_version: "module_current",
		},
		ndk: {
		vndk: {
		enabled: true,
		},
		},
		},
		}

		java_library {
		name: "android.hardware.radio-translate-java",
		libs: [
		"android.hardware.radio-V1-java",
		"android.hardware.radio-V1.0-java",
		"android.hardware.radio-V1.1-java",
		"android.hardware.radio-V1.2-java",
		"android.hardware.radio-V1.3-java",
		"android.hardware.radio-V1.4-java",
		"android.hardware.radio-V1.5-java",
		"android.hardware.radio-V1.6-java",
		],
		aidl_interface {
		name: "android.hardware.radio.sim",
		vendor_available: true,
		srcs: ["android/hardware/radio/sim/*.aidl"],
		stability: "vintf",
		imports: ["android.hardware.radio"],
		backend: {
		cpp: {
		enabled: false,
		},
		java: {
		sdk_version: "module_current",
		},
		ndk: {
		vndk: {
		enabled: true,
		},
		},
		},
		}

		aidl_interface {
		name: "android.hardware.radio.voice",
		vendor_available: true,
		srcs: ["android/hardware/radio/voice/*.aidl"],
		stability: "vintf",
		imports: ["android.hardware.radio"],
		backend: {
		cpp: {
		enabled: false,
		},
		java: {
		sdk_version: "module_current",
		},
		ndk: {
		vndk: {
		enabled: true,
		},
		},
		},
		}

radio/aidl/aidl_api/android.hardware.radio/current/android/hardware/radio/ApnAuthType.aidl→radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/ApnAuthType.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@
		// with such a backward incompatible change, it has a high risk of breaking
		// later when a module using the interface is updated, e.g., Mainline modules.

		package android.hardware.radio;
		package android.hardware.radio.data;
		@Backing(type="int") @VintfStability
		enum ApnAuthType {
		NO_PAP_NO_CHAP = 0,

radio/aidl/aidl_api/android.hardware.radio/current/android/hardware/radio/ApnTypes.aidl→radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/ApnTypes.aidl

+1 −2

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@
		// with such a backward incompatible change, it has a high risk of breaking
		// later when a module using the interface is updated, e.g., Mainline modules.

		package android.hardware.radio;
		package android.hardware.radio.data;
		@Backing(type="int") @VintfStability
		enum ApnTypes {
		NONE = 0,
		@@ -45,7 +45,6 @@ enum ApnTypes {
		CBS = 128,
		IA = 256,
		EMERGENCY = 512,
		ALL = 1023,
		MCX = 1024,
		XCAP = 2048,
		}