[DO NOT MERGE] Fix SHAs in IRadio 1.5
Tweak files in AOSP and update SHAs to match internal master.
Bug: 147379351
Test: update-makefiles
Change-Id: Iac00853bc00c003848b3d45ebb19d15c4f6fba0b
diff --git a/radio/1.5/IRadio.hal b/radio/1.5/IRadio.hal
index 09be37a..fafc6e2 100644
--- a/radio/1.5/IRadio.hal
+++ b/radio/1.5/IRadio.hal
@@ -151,8 +151,8 @@
* @param reason The request reason. Must be DataRequestReason.NORMAL or
* DataRequestReason.HANDOVER.
* @param addresses If the reason is DataRequestReason.HANDOVER, this indicates the list of link
- * addresses of the existing data connection. This parameter must be ignored
- * unless reason is DataRequestReason.HANDOVER.
+ * addresses of the existing data connection. This parameter must be ignored unless reason
+ * is DataRequestReason.HANDOVER.
* @param dnses If the reason is DataRequestReason.HANDOVER, this indicates the list of DNS
* addresses of the existing data connection. The format is defined in RFC-4291 section
* 2.2. For example, "192.0.1.3" or "2001:db8::1". This parameter must be ignored unless
@@ -161,7 +161,7 @@
* Response function is IRadioResponse.setupDataCallResponse_1_5()
*
* Note this API is the same as the 1.4 version except using the
- * 1.5 AccessNetwork and DataProfileInto as the input param.
+ * 1.5 AccessNetwork, DataProfileInto, and link addresses as the input param.
*/
oneway setupDataCall_1_5(int32_t serial, AccessNetwork accessNetwork,
DataProfileInfo dataProfileInfo, bool roamingAllowed,
@@ -189,7 +189,7 @@
* Response callback is IRadioResponse.setDataProfileResponse_1_5()
*
* Note this API is the same as the 1.4 version except using the 1.5 DataProfileInfo
- * and LinkAddress as the input param.
+ * as the input param.
*/
oneway setDataProfile_1_5(int32_t serial, vec<DataProfileInfo> profiles);
diff --git a/radio/1.5/types.hal b/radio/1.5/types.hal
index 2a2ba11..7d6ec41 100644
--- a/radio/1.5/types.hal
+++ b/radio/1.5/types.hal
@@ -312,6 +312,9 @@
DEPRECATED = 0x20,
};
+/**
+ * Describes a data link address for mobile data connection.
+ */
struct LinkAddress {
/**
* The format is IP address with optional "/"
@@ -342,7 +345,7 @@
/**
* Overwritten from @1.4::SetupDataCallResult in order to update the addresses to 1.5
- * version.
+ * version. In 1.5 the type of addresses changes to vector of LinkAddress.
*/
struct SetupDataCallResult {
/** Data call fail cause. DataCallFailCause.NONE if no error. */