summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot2018-01-25 11:41:57 -0600
committerGerrit Code Review2018-01-25 11:41:57 -0600
commit4365f2e6bca4aef0bb7aadc3d31f8517426322dc (patch)
tree7fda3e8121929158a7917fb6710c5b05e5987f4d
parentedf1e2f589b70dae05c2fb7026ec6c36937efec9 (diff)
parent76499e9be5b5e100f6a03b4aa0ec301f3017f1a0 (diff)
downloadplatform-hardware-interfaces-android-wear-8.0.0_r1.tar.gz
platform-hardware-interfaces-android-wear-8.0.0_r1.tar.xz
platform-hardware-interfaces-android-wear-8.0.0_r1.zip
Merge "HIDL changes for IWLAN refactoring"android-wear-8.0.0_r1
-rw-r--r--radio/1.2/IRadio.hal65
-rw-r--r--radio/1.2/types.hal29
2 files changed, 94 insertions, 0 deletions
diff --git a/radio/1.2/IRadio.hal b/radio/1.2/IRadio.hal
index babe86f6..67ce56c5 100644
--- a/radio/1.2/IRadio.hal
+++ b/radio/1.2/IRadio.hal
@@ -18,6 +18,8 @@ package android.hardware.radio@1.2;
18 18
19import @1.1::IRadio; 19import @1.1::IRadio;
20import @1.1::RadioAccessNetworks; 20import @1.1::RadioAccessNetworks;
21import @1.0::DataProfileInfo;
22import @1.0::RadioTechnology;
21 23
22/** 24/**
23 * This interface is used by telephony and telecom to talk to cellular radio. 25 * This interface is used by telephony and telecom to talk to cellular radio.
@@ -106,4 +108,67 @@ interface IRadio extends @1.1::IRadio {
106 oneway setLinkCapacityReportingCriteria(int32_t serial, int32_t hysteresisMs, 108 oneway setLinkCapacityReportingCriteria(int32_t serial, int32_t hysteresisMs,
107 int32_t hysteresisDlKbps, int32_t hysteresisUlKbps, vec<int32_t> thresholdsDownlinkKbps, 109 int32_t hysteresisDlKbps, int32_t hysteresisUlKbps, vec<int32_t> thresholdsDownlinkKbps,
108 vec<int32_t> thresholdsUplinkKbps, RadioAccessNetworks ran); 110 vec<int32_t> thresholdsUplinkKbps, RadioAccessNetworks ran);
111
112 /**
113 * Setup a packet data connection. If DataCallResponse.status returns DataCallFailCause:NONE,
114 * the data connection must be added to data calls and a unsolDataCallListChanged() must be
115 * sent. The call remains until removed by subsequent unsolDataCallIstChanged(). It may be
116 * lost due to many factors, including deactivateDataCall() being issued, the radio powered
117 * off, reception lost or even transient factors like congestion. This data call list is
118 * returned by getDataCallList() and dataCallListChanged().
119 *
120 * The Radio is expected to:
121 * - Create one data call context.
122 * - Create and configure a dedicated interface for the context.
123 * - The interface must be point to point.
124 * - The interface is configured with one or more addresses and is capable of sending and
125 * receiving packets. The prefix length of the addresses must be /32 for IPv4 and /128
126 * for IPv6.
127 * - Must not modify routing configuration related to this interface; routing management is
128 * exclusively within the purview of the Android OS.
129 * - Support simultaneous data call contexts up to DataRegStateResult.maxDataCalls specified
130 * in the response of getDataRegistrationState.
131 *
132 * @param serial Serial number of request.
133 * @param accessNetwork The access network to setup the data call. If the data connection cannot
134 * be established on the specified access network, the setup request must be failed.
135 * @param dataProfileInfo Data profile info.
136 * @param modemCognitive Indicates that the requested profile has previously been provided via
137 * setDataProfile().
138 * @param roamingAllowed Indicates whether or not data roaming is allowed by the user.
139 * @param isRoaming Indicates whether or not the framework has requested this setupDataCall for
140 * a roaming network. The 'protocol' parameter in the old RIL API must be filled
141 * accordingly based on the roaming condition. Note this is for backward compatibility with
142 * the old radio modem. The modem must not use this param for any other reason.
143 * @param reason The request reason. Must be DataRequestReason.NORMAL or
144 * DataRequestReason.HANDOVER.
145 * @param addresses If the reason is DataRequestReason.HANDOVER, this indicates the list of link
146 * addresses of the existing data connection. The format is IP address with optional "/"
147 * prefix length (The format is defined in RFC-4291 section 2.3). For example, "192.0.1.3",
148 * "192.0.1.11/16", or "2001:db8::1/64". Typically one IPv4 or one IPv6 or one of each. If
149 * the prefix length is absent, then the addresses are assumed to be point to point with
150 * IPv4 with prefix length 32 or IPv6 with prefix length 128. This parameter must be ignored
151 * unless reason is DataRequestReason.HANDOVER.
152 * @param dnses If the reason is DataRequestReason.HANDOVER, this indicates the list of DNS
153 * addresses of the existing data connection. The format is defined in RFC-4291 section
154 * 2.2. For example, "192.0.1.3" or "2001:db8::1". This parameter must be ignored unless
155 * reason is DataRequestReason.HANDOVER.
156 *
157 * Response function is IRadioResponse.setupDataCallResponse()
158 */
159 oneway setupDataCall_1_2(int32_t serial, AccessNetwork accessNetwork,
160 DataProfileInfo dataProfileInfo, bool modemCognitive, bool roamingAllowed,
161 bool isRoaming, DataRequestReason reason, vec<string> addresses, vec<string> dnses);
162
163 /**
164 * Deactivate packet data connection and remove from the data call list. An
165 * unsolDataCallListChanged() must be sent when data connection is deactivated.
166 *
167 * @param serial Serial number of request.
168 * @param cid Data call id.
169 * @param reason The request reason. Must be normal, handover, or shutdown.
170 *
171 * Response function is IRadioResponse.deactivateDataCallResponse()
172 */
173 oneway deactivateDataCall_1_2(int32_t serial, int32_t cid, DataRequestReason reason);
109}; 174};
diff --git a/radio/1.2/types.hal b/radio/1.2/types.hal
index 45152379..f2f0b69b 100644
--- a/radio/1.2/types.hal
+++ b/radio/1.2/types.hal
@@ -335,3 +335,32 @@ struct PhysicalChannelConfig {
335 */ 335 */
336 int32_t cellBandwidthDownlink; 336 int32_t cellBandwidthDownlink;
337}; 337};
338
339enum AccessNetwork : int32_t {
340 /** GSM EDGE Radio Access Network */
341 GERAN = 1,
342 /** Universal Terrestrial Radio Access Network */
343 UTRAN = 2,
344 /** Evolved Universal Terrestrial Radio Access Network */
345 EUTRAN = 3,
346 /** CDMA 2000 network */
347 CDMA2000 = 4,
348 /** Interworking Wireless LAN */
349 IWLAN = 5
350};
351
352enum DataRequestReason : int32_t {
353 /**
354 * The reason of the data request is normal
355 */
356 NORMAL = 0x01,
357 /**
358 * The reason of the data request is device shutdown
359 */
360 SHUTDOWN = 0x02,
361 /**
362 * The reason of the data request is IWLAN data handover to another transport
363 * (e.g. from cellular to wifi or vise versa)
364 */
365 HANDOVER = 0x03,
366};