Pass ProgramInfo over currentProgramInfoChanged and drop afSwitch_1_1.
Bug: b/64229617
Test: VTS, instrumentation
Change-Id: Id2d209a31d801f85e197312673eb6b7ee63ada46
diff --git a/broadcastradio/1.1/ITunerCallback.hal b/broadcastradio/1.1/ITunerCallback.hal
index 2e593b0..8bf5b7f 100644
--- a/broadcastradio/1.1/ITunerCallback.hal
+++ b/broadcastradio/1.1/ITunerCallback.hal
@@ -33,23 +33,16 @@
* The 1.0 callback must not be called when HAL implementation detects
* 1.1 client (by casting V1_0::ITunerCallback to V1_1::ITunerCallback).
*
+ * In case of success, currentProgramInfoChanged must be called too.
+ * It means the success case may (or may not) be handled by the client in
+ * currentProgramInfoChanged, instead of here.
+ *
* @param result OK if tune succeeded or TIMEOUT in case of time out.
* @param selector A ProgramSelector structure describing the tuned station.
*/
oneway tuneComplete_1_1(Result result, ProgramSelector selector);
/**
- * Method called by the HAL when a frequency switch occurs.
- *
- * This callback supersedes V1_0::afSwitch.
- * The 1.0 callback must not be called when HAL implementation detects
- * 1.1 client (by casting V1_0::ITunerCallback to V1_1::ITunerCallback).
- *
- * @param selector A ProgramSelector structure describing the tuned station.
- */
- oneway afSwitch_1_1(ProgramSelector selector);
-
- /**
* Called by the HAL when background scan feature becomes available or not.
*
* @param isAvailable true, if the tuner turned temporarily background-
@@ -92,10 +85,12 @@
*
* This may be called together with tuneComplete_1_1 or afSwitch_1_1.
*
- * This callback supersedes V1_0::newMetadata and partly V1_0::tuneComplete
- * and V1_0::afSwitch.
+ * This callback supersedes V1_0::newMetadata and V1_0::afSwitch;
+ * partly V1_0::tuneComplete.
* 1.0 callbacks must not be called when HAL implementation detects
* 1.1 client (by casting V1_0::ITunerCallback to V1_1::ITunerCallback).
+ *
+ * @param info current program information
*/
- oneway currentProgramInfoChanged();
+ oneway currentProgramInfoChanged(ProgramInfo info);
};