From 6ca90ed3cf35de6cb21b6d1ce886e2c7c4c91a2c Mon Sep 17 00:00:00 2001
From: Tomasz Wasilczyk <twasilczyk@google.com>
Date: Mon, 15 May 2017 12:57:20 -0700
Subject: [PATCH] Fix getProgramList comment about possible result.

Also change default implementation results for not implemented calls
to be less harsh.

Test: instrumentation
Bug: b/36863239
Change-Id: I7f9adea8aa5b84aec81be13f5614ba16c8b74b75
---
 broadcastradio/1.1/ITuner.hal        | 1 +
 broadcastradio/1.1/default/Tuner.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/broadcastradio/1.1/ITuner.hal b/broadcastradio/1.1/ITuner.hal
index dd7c84460c..751162966f 100644
--- a/broadcastradio/1.1/ITuner.hal
+++ b/broadcastradio/1.1/ITuner.hal
@@ -65,6 +65,7 @@ interface ITuner extends @1.0::ITuner {
      *               Client application MUST verify vendor/product name
      *               before setting this parameter to anything else.
      * @return result OK if the list was successfully retrieved.
+     *                INVALID_ARGUMENTS if invalid arguments are passed
      *                NOT_READY if the scan is in progress.
      *                NOT_STARTED if the scan has not been started, client may
      *                call startBackgroundScan to fix this.
diff --git a/broadcastradio/1.1/default/Tuner.cpp b/broadcastradio/1.1/default/Tuner.cpp
index 4a6c691fed..ae5848cec7 100644
--- a/broadcastradio/1.1/default/Tuner.cpp
+++ b/broadcastradio/1.1/default/Tuner.cpp
@@ -201,25 +201,25 @@ exit:
 }
 
 Return<ProgramListResult> Tuner::startBackgroundScan() {
-    return ProgramListResult::NOT_INITIALIZED;
+    return ProgramListResult::UNAVAILABLE;
 }
 
 Return<void> Tuner::getProgramList(const hidl_string& filter __unused, getProgramList_cb _hidl_cb) {
     hidl_vec<ProgramInfo> pList;
     // TODO(b/34054813): do the actual implementation.
-    _hidl_cb(ProgramListResult::NOT_INITIALIZED, pList);
+    _hidl_cb(ProgramListResult::NOT_STARTED, pList);
     return Void();
 }
 
 Return<void> Tuner::isAnalogForced(isAnalogForced_cb _hidl_cb) {
     // TODO(b/34348946): do the actual implementation.
-    _hidl_cb(Result::NOT_INITIALIZED, false);
+    _hidl_cb(Result::INVALID_STATE, false);
     return Void();
 }
 
 Return<Result> Tuner::setAnalogForced(bool isForced __unused) {
     // TODO(b/34348946): do the actual implementation.
-    return Result::NOT_INITIALIZED;
+    return Result::INVALID_STATE;
 }
 
 } // namespace implementation