Merge "Update IRadioIms for startImsTraffic and updateImsCallStatus" (b430f6e7) · Commits · e / os / android_hardware_interfaces

radio/aidl/aidl_api/android.hardware.radio.ims/current/android/hardware/radio/ims/IRadioIms.aidl

+2 −1

Original line number	Diff line number	Diff line
		@@ -36,9 +36,10 @@ package android.hardware.radio.ims;
		interface IRadioIms {
		oneway void setSrvccCallInfo(int serial, in android.hardware.radio.ims.SrvccCall[] srvccCalls);
		oneway void updateImsRegistrationInfo(int serial, in android.hardware.radio.ims.ImsRegistration imsRegistration);
		oneway void startImsTraffic(int serial, int token, android.hardware.radio.ims.ImsTrafficType imsTrafficType, android.hardware.radio.AccessNetwork accessNetworkType);
		oneway void startImsTraffic(int serial, int token, android.hardware.radio.ims.ImsTrafficType imsTrafficType, android.hardware.radio.AccessNetwork accessNetworkType, android.hardware.radio.ims.ImsCall.Direction trafficDirection);
		oneway void stopImsTraffic(int serial, int token);
		oneway void triggerEpsFallback(int serial, in android.hardware.radio.ims.EpsFallbackReason reason);
		oneway void setResponseFunctions(in android.hardware.radio.ims.IRadioImsResponse radioImsResponse, in android.hardware.radio.ims.IRadioImsIndication radioImsIndication);
		oneway void sendAnbrQuery(int serial, android.hardware.radio.ims.ImsStreamType mediaType, android.hardware.radio.ims.ImsStreamDirection direction, int bitsPerSecond);
		oneway void updateImsCallStatus(int serial, in android.hardware.radio.ims.ImsCall[] imsCalls);
		}

radio/aidl/aidl_api/android.hardware.radio.ims/current/android/hardware/radio/ims/IRadioImsResponse.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -40,4 +40,5 @@ interface IRadioImsResponse {
		oneway void stopImsTrafficResponse(in android.hardware.radio.RadioResponseInfo info);
		oneway void triggerEpsFallbackResponse(in android.hardware.radio.RadioResponseInfo info);
		oneway void sendAnbrQueryResponse(in android.hardware.radio.RadioResponseInfo info);
		oneway void updateImsCallStatusResponse(in android.hardware.radio.RadioResponseInfo info);
		}

radio/aidl/aidl_api/android.hardware.radio.ims/current/android/hardware/radio/ims/ImsCall.aidl

0 → 100644

+64 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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.
		*/
		///////////////////////////////////////////////////////////////////////////////
		// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
		///////////////////////////////////////////////////////////////////////////////

		// This file is a snapshot of an AIDL file. Do not edit it manually. There are
		// two cases:
		// 1). this is a frozen version file - do not edit this in any case.
		// 2). this is a 'current' file. If you make a backwards compatible change to
		// the interface (from the latest frozen version), the build system will
		// prompt you to update this file with `m <name>-update-api`.
		//
		// You must not make a backward incompatible change to any AIDL file built
		// with the aidl_interface module type with versions property set. The module
		// type is used to build AIDL files in a way that they can be used across
		// independently updatable components of the system. If a device is shipped
		// 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.ims;
		@JavaDerive(toString=true) @VintfStability
		parcelable ImsCall {
		int index;
		android.hardware.radio.ims.ImsCall.CallType callType;
		android.hardware.radio.AccessNetwork accessNetwork;
		android.hardware.radio.ims.ImsCall.CallState callState;
		android.hardware.radio.ims.ImsCall.Direction direction;
		boolean isHeldByRemote;
		@Backing(type="int")
		enum CallType {
		NORMAL = 0,
		EMERGENCY = 1,
		}
		@Backing(type="int")
		enum CallState {
		ACTIVE = 0,
		HOLDING = 1,
		DIALING = 2,
		ALERTING = 3,
		INCOMING = 4,
		WAITING = 5,
		DISCONNECTING = 6,
		DISCONNECTED = 7,
		}
		@Backing(type="int")
		enum Direction {
		INCOMING = 0,
		OUTGOING = 1,
		}
		}

radio/aidl/android/hardware/radio/ims/IRadioIms.aidl

+18 −5

Original line number	Diff line number	Diff line
		@@ -18,14 +18,14 @@ package android.hardware.radio.ims;

		import android.hardware.radio.AccessNetwork;
		import android.hardware.radio.ims.EpsFallbackReason;
		import android.hardware.radio.ims.ImsRegistration;
		import android.hardware.radio.ims.ImsStreamDirection;
		import android.hardware.radio.ims.ImsTrafficType;
		import android.hardware.radio.ims.IRadioImsIndication;
		import android.hardware.radio.ims.IRadioImsResponse;
		import android.hardware.radio.ims.SrvccCall;
		import android.hardware.radio.ims.ImsCall;
		import android.hardware.radio.ims.ImsRegistration;
		import android.hardware.radio.ims.ImsStreamDirection;
		import android.hardware.radio.ims.ImsStreamType;
		import android.hardware.radio.ims.ImsTrafficType;
		import android.hardware.radio.ims.SrvccCall;

		/**
		* This interface is used by IMS telephony layer to talk to cellular radio.
		@@ -85,11 +85,14 @@ oneway interface IRadioIms {
		* @param token A nonce to identify the request
		* @param imsTrafficType IMS traffic type like registration, voice, and video
		* @param accessNetworkType The type of the radio access network used
		* @param trafficDirection Indicates whether traffic is originated by mobile originated or
		* mobile terminated use case eg. MO/MT call/SMS etc
		*
		* Response function is IRadioImsResponse.startImsTrafficResponse()
		*/
		void startImsTraffic(int serial, int token,
		ImsTrafficType imsTrafficType, AccessNetwork accessNetworkType);
		ImsTrafficType imsTrafficType, AccessNetwork accessNetworkType,
		ImsCall.Direction trafficDirection);

		/**
		* Indicates IMS traffic has been stopped.
		@@ -136,4 +139,14 @@ oneway interface IRadioIms {
		* Response function is IRadioImsResponse.sendAnbrQueryResponse()
		*/
		void sendAnbrQuery(int serial, ImsStreamType mediaType, ImsStreamDirection direction, int bitsPerSecond);

		/**
		* Provides a list of IMS call information to radio.
		*
		* @param serial Serial number of request
		* @param imsCalls The list of IMS calls
		*
		* Response function is IRadioImsResponse.updateImsCallStatusResponse()
		*/
		void updateImsCallStatus(int serial, in ImsCall[] imsCalls);
		}

radio/aidl/android/hardware/radio/ims/IRadioImsResponse.aidl

+17 −0

Original line number	Diff line number	Diff line
		@@ -128,4 +128,21 @@ oneway interface IRadioImsResponse {
		* RadioError:NO_RESOURCES
		*/
		void sendAnbrQueryResponse(in RadioResponseInfo info);

		/**
		* @param info Response info struct containing response type, serial no. and error
		*
		* Valid errors returned:
		* RadioError:NONE
		* RadioError:RADIO_NOT_AVAILABLE
		* RadioError:INVALID_STATE
		* RadioError:NO_MEMORY
		* RadioError:SYSTEM_ERR
		* RadioError:MODEM_ERR
		* RadioError:INTERNAL_ERR
		* RadioError:INVALID_ARGUMENTS
		* RadioError:REQUEST_NOT_SUPPORTED
		* RadioError:NO_RESOURCES
		*/
		void updateImsCallStatusResponse(in RadioResponseInfo info);
		}