commit 500733c45992cfa9e4ffb23aea2b6df9f802e4ee
author Nathan Harold <nharold@google.com> Mon Jan 20 17:04:16 2020 -0800
committer Sarah Chin <sarahchin@google.com> Tue Jan 21 23:57:21 2020 -0800
tree aac3da61be71fc1655a33ebabd477b353c2a1e90
parent 8f6b67b0a668ad4cacb88d933417e350716bc17f

Add Multi-PLMN and CSG support

Non-functional changes:
-Clarify that the MCC+MNC in the CellIdentity should be used to
 report the Primary PLMN only; (this PLMN is globally unique, and
 can be used to construct a CGI/ECGI whereas other PLMN-IDs cannot).
-Add clarification for the reporting of multi-PLMN 5G networks.

Functional changes:
-Add a list of PLMNs for MOCN Networks. This allows cells that are
 shared by multiple operators to be properly reported.
-Add support for Closed Subscriber Group reporting to allow
 identification of small-cell deployments.

Bug: 135921133
Test: make VtsHalRadioV1_5Target
      && make aosp_cf_x86_64_phone-userdebug
Change-Id: Ibb0682de8ae9c4421e79086773c977a4e76ac4f1

radio/1.5/vts/functional/radio_hidl_hal_utils_v1_5.h

diff --git a/radio/1.5/vts/functional/radio_hidl_hal_utils_v1_5.h b/radio/1.5/vts/functional/radio_hidl_hal_utils_v1_5.h
index 9256c3e..1e806fa 100644
--- a/radio/1.5/vts/functional/radio_hidl_hal_utils_v1_5.h
+++ b/radio/1.5/vts/functional/radio_hidl_hal_utils_v1_5.h
@@ -566,6 +566,11 @@
     Return<void> getDataRegistrationStateResponse_1_5(
             const RadioResponseInfo& info,
             const ::android::hardware::radio::V1_5::RegStateResult& regResponse);
+
+    Return<void> getCellInfoListResponse_1_5(
+            const RadioResponseInfo& info,
+            const ::android::hardware::hidl_vec<::android::hardware::radio::V1_5::CellInfo>&
+                    cellInfo);
 };
 
 /* Callback class for radio indication */
@@ -580,6 +585,15 @@
     /* 1.5 Api */
     Return<void> uiccApplicationsEnablementChanged(RadioIndicationType type, bool enabled);
 
+    Return<void> networkScanResult_1_5(
+            RadioIndicationType type,
+            const ::android::hardware::radio::V1_5::NetworkScanResult& result);
+
+    Return<void> cellInfoList_1_5(
+            RadioIndicationType type,
+            const ::android::hardware::hidl_vec<::android::hardware::radio::V1_5::CellInfo>&
+                    records);
+
     /* 1.4 Api */
     Return<void> currentEmergencyNumberList(
             RadioIndicationType type,

radio/1.5/vts/functional/radio_indication.cpp

diff --git a/radio/1.5/vts/functional/radio_indication.cpp b/radio/1.5/vts/functional/radio_indication.cpp
index 1483907..d448a22 100644
--- a/radio/1.5/vts/functional/radio_indication.cpp
+++ b/radio/1.5/vts/functional/radio_indication.cpp
@@ -350,3 +350,16 @@
         /*barringInfos*/) {
     return Void();
 }
+
+Return<void> RadioIndication_v1_5::networkScanResult_1_5(
+        RadioIndicationType /*type*/,
+        const ::android::hardware::radio::V1_5::NetworkScanResult& /*result*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_5::cellInfoList_1_5(
+        RadioIndicationType /*type*/,
+        const ::android::hardware::hidl_vec<
+                ::android::hardware::radio::V1_5::CellInfo>& /*records*/) {
+    return Void();
+}

radio/1.5/vts/functional/radio_response.cpp

diff --git a/radio/1.5/vts/functional/radio_response.cpp b/radio/1.5/vts/functional/radio_response.cpp
index d16833c..01556f5 100644
--- a/radio/1.5/vts/functional/radio_response.cpp
+++ b/radio/1.5/vts/functional/radio_response.cpp
@@ -985,3 +985,10 @@
     parent_v1_5.notify(info.serial);
     return Void();
 }
+
+Return<void> RadioResponse_v1_5::getCellInfoListResponse_1_5(
+        const RadioResponseInfo& /*info*/,
+        const ::android::hardware::hidl_vec<
+                ::android::hardware::radio::V1_5::CellInfo>& /*cellInfo*/) {
+    return Void();
+}