Merge changes from topics "caps_refactor", "phone-cap-revert", "radioconfig-revert" am: 48da0e3fe2 (bc965dd1) · Commits · e / os / android_hardware_interfaces

compatibility_matrices/compatibility_matrix.current.xml

+4 −1

Original line number	Diff line number	Diff line
		@@ -371,7 +371,10 @@
		</hal>
		<hal format="hidl" optional="true">
		<name>android.hardware.radio.config</name>
		<version>1.3</version>
		<!--
		See compatibility_matrix.4.xml on versioning of radio config HAL.
		-->
		<version>1.1</version>
		<interface>
		<name>IRadioConfig</name>
		<instance>default</instance>

+0 −4

Original line number	Diff line number	Diff line
		@@ -647,7 +647,3 @@ c9273429fcf98d797d3bb07fdba6f1be95bf960f9255cde169fd1ca4db85f856 android.hardwar
		7fefa2cc5b3b3be10b5cff5c5dc195385f491d4bf23ca65f9c6b3c30c8753a33 android.hardware.radio@1.5::IRadio
		e96ae1c3a9c0689002ec2318e9c587f4f607c16a75a3cd38788b77eb91072021 android.hardware.radio@1.5::IRadioIndication
		6759e59cef81b5e15137bf99a4cd14236ce0c2974dd307ada265b67e819b9060 android.hardware.radio@1.5::IRadioResponse
		55f0a15642869ec98a55ea0a5ac049d3e1a6245ff7750deb6bcb7182057eee83 android.hardware.radio.config@1.3::types
		b27ab0cd40b0b078cdcd024bfe1061c4c4c065f3519eeb9347fa359a3268a5ae android.hardware.radio.config@1.3::IRadioConfig
		742360c775313438b0f82256eac62fb5bbc76a6ae6f388573f3aa142fb2c1eea android.hardware.radio.config@1.3::IRadioConfigIndication
		7683fed9d253956071f18b152e6be657719536f98d9b534433d5e411bcde5061 android.hardware.radio.config@1.3::IRadioConfigResponse

deleted100644 → 0

+0 −23

Original line number	Diff line number	Diff line
		// This file is autogenerated by hidl-gen -Landroidbp.

		hidl_interface {
		name: "android.hardware.radio.config@1.3",
		root: "android.hardware",
		vndk: {
		enabled: true,
		},
		srcs: [
		"types.hal",
		"IRadioConfig.hal",
		"IRadioConfigIndication.hal",
		"IRadioConfigResponse.hal",
		],
		interfaces: [
		"android.hardware.radio.config@1.0",
		"android.hardware.radio.config@1.1",
		"android.hardware.radio.config@1.2",
		"android.hardware.radio@1.0",
		"android.hidl.base@1.0",
		],
		gen_java: true,
		}

deleted100644 → 0

+0 −31

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.hardware.radio.config@1.3;

		import @1.1::IRadioConfig;

		/**
		* 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.
		*/
		interface IRadioConfig extends @1.1::IRadioConfig {

		};

deleted100644 → 0

+0 −26

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.hardware.radio.config@1.3;

		import @1.2::IRadioConfigIndication;

		/**
		* Interface declaring unsolicited radio config indications.
		*/
		interface IRadioConfigIndication extends @1.2::IRadioConfigIndication {

		};