From f69abcf78e4a9b34d72d34e6d9c1f7067817ae34 Mon Sep 17 00:00:00 2001
From: Sarah Chin <sarahchin@google.com>
Date: Wed, 18 Nov 2020 13:40:15 -0800
Subject: [PATCH] Create getSystemSelectionChannel API

Test: atest TelephonyManagerTest
Test: atest VtsHalRadioV1_6TargetTest
Bug: 152813408
Change-Id: I6f3f70b7ff1b876ec98086431ed5c557875fca85
Merged-In: I6f3f70b7ff1b876ec98086431ed5c557875fca85
---
 radio/1.6/IRadio.hal                                 |  9 +++++++++
 radio/1.6/IRadioResponse.hal                         | 11 +++++++++++
 radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h |  3 +++
 radio/1.6/vts/functional/radio_response.cpp          |  7 +++++++
 4 files changed, 30 insertions(+)

diff --git a/radio/1.6/IRadio.hal b/radio/1.6/IRadio.hal
index 8afbf22c64..7f874c64e9 100644
--- a/radio/1.6/IRadio.hal
+++ b/radio/1.6/IRadio.hal
@@ -349,4 +349,13 @@ interface IRadio extends @1.5::IRadio {
     oneway setDataThrottling(int32_t serial,
             DataThrottlingAction dataThrottlingAction,
             int32_t completionWindowSecs);
+
+    /**
+     * Get which bands the modem's background scan is acting on.
+     *
+     * @param serial Serial number of request.
+     *
+     * Response callback is IRadioResponse.getSystemSelectionChannelsResponse()
+     */
+    oneway getSystemSelectionChannels(int32_t serial);
 };
diff --git a/radio/1.6/IRadioResponse.hal b/radio/1.6/IRadioResponse.hal
index 5a71c1fe54..c545db02ef 100644
--- a/radio/1.6/IRadioResponse.hal
+++ b/radio/1.6/IRadioResponse.hal
@@ -317,4 +317,15 @@ interface IRadioResponse extends @1.5::IRadioResponse {
      *  RadioError:INVALID_ARGUMENTS
      */
     oneway setDataThrottlingResponse(RadioResponseInfo info);
+
+    /**
+     * @param info Response info struct containing response type, serial no. and error
+     *
+     * Valid errors returned:
+     *   RadioError:NONE
+     *   RadioError:RADIO_NOT_AVAILABLE
+     *   RadioError:INTERNAL_ERR
+     *   RadioError:INVALID_ARGUMENTS
+     */
+    oneway getSystemSelectionChannelsResponse(RadioResponseInfo info);
 };
diff --git a/radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h b/radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h
index fcf679c267..85be903e9e 100644
--- a/radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h
+++ b/radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h
@@ -795,6 +795,9 @@ class RadioResponse_v1_6 : public ::android::hardware::radio::V1_6::IRadioRespon
 
     Return<void> setDataThrottlingResponse(
             const ::android::hardware::radio::V1_6::RadioResponseInfo& info);
+
+    Return<void> getSystemSelectionChannelsResponse(
+            const ::android::hardware::radio::V1_6::RadioResponseInfo& info);
 };
 
 /* Callback class for radio indication */
diff --git a/radio/1.6/vts/functional/radio_response.cpp b/radio/1.6/vts/functional/radio_response.cpp
index 788038a041..7da675ea12 100644
--- a/radio/1.6/vts/functional/radio_response.cpp
+++ b/radio/1.6/vts/functional/radio_response.cpp
@@ -1163,3 +1163,10 @@ Return<void> RadioResponse_v1_6::setDataThrottlingResponse(
     parent_v1_6.notify(info.serial);
     return Void();
 }
+
+Return<void> RadioResponse_v1_6::getSystemSelectionChannelsResponse(
+        const ::android::hardware::radio::V1_6::RadioResponseInfo& info) {
+    rspInfo = info;
+    parent_v1_6.notify(info.serial);
+    return Void();
+}