commit 4bb9d310d416bb92a64ab599ab534a9784378cee
author Nathan Harold <nharold@google.com> Mon Dec 23 14:34:26 2019 -0800
committer Nathan Harold <nharold@google.com> Tue Jan 14 01:09:08 2020 +0000
tree 63dec57f131cdb0cad7b3199b751935bbbd114cc
parent 77367c822f6c0fb98bde845d8b803e74368bbb52

Add an Indication for Barring Info

Add an indication and request+response to get updated
barring information for the current cell.

Bug: 143231559
Bug: 143226991
Test: compilation && atest VtsHalRadioV1_5TargetTest
Change-Id: I226cf66dd6b9b71a6c020cdd618fe5e2af0baa20

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 c3c9f54..217caf5 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
@@ -553,6 +553,11 @@
     Return<void> setRadioPowerResponse_1_5(const RadioResponseInfo& info);
 
     Return<void> setIndicationFilterResponse_1_5(const RadioResponseInfo& info);
+
+    Return<void> getBarringInfoResponse(
+            const RadioResponseInfo& info,
+            const ::android::hardware::hidl_vec<::android::hardware::radio::V1_5::BarringInfo>&
+                    barringInfos);
 };
 
 /* Callback class for radio indication */
@@ -748,6 +753,12 @@
             const ::android::hardware::hidl_string& chosenPlmn,
             ::android::hardware::hidl_bitfield<::android::hardware::radio::V1_5::Domain> domain,
             int32_t causeCode, int32_t additionalCauseCode);
+
+    Return<void> barringInfoChanged(
+            RadioIndicationType /*type*/,
+            const ::android::hardware::radio::V1_5::CellIdentity& /*cellIdentity*/,
+            const ::android::hardware::hidl_vec<::android::hardware::radio::V1_5::BarringInfo>&
+            /*barringInfos*/);
 };
 
 // Test environment for Radio HIDL HAL.

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 2416605..1483907 100644
--- a/radio/1.5/vts/functional/radio_indication.cpp
+++ b/radio/1.5/vts/functional/radio_indication.cpp
@@ -342,3 +342,11 @@
         int32_t /*causeCode*/, int32_t /*additionalCauseCode*/) {
     return Void();
 }
+
+Return<void> RadioIndication_v1_5::barringInfoChanged(
+        RadioIndicationType /*type*/,
+        const ::android::hardware::radio::V1_5::CellIdentity& /*cellIdentity*/,
+        const ::android::hardware::hidl_vec<::android::hardware::radio::V1_5::BarringInfo>&
+        /*barringInfos*/) {
+    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 877945f..644a262 100644
--- a/radio/1.5/vts/functional/radio_response.cpp
+++ b/radio/1.5/vts/functional/radio_response.cpp
@@ -960,3 +960,12 @@
     parent_v1_5.notify(info.serial);
     return Void();
 }
+
+Return<void> RadioResponse_v1_5::getBarringInfoResponse(
+        const RadioResponseInfo& info,
+        const ::android::hardware::hidl_vec<::android::hardware::radio::V1_5::BarringInfo>&
+        /*barringInfos*/) {
+    rspInfo = info;
+    parent_v1_5.notify(info.serial);
+    return Void();
+}