commit 30240f61ed64bc24b493a4930467c25eb6bfe1b8
author Tomasz Wasilczyk <twasilczyk@google.com> Wed Dec 20 14:19:21 2017 -0800
committer Tomasz Wasilczyk <twasilczyk@google.com> Wed Dec 20 14:49:45 2017 -0800
tree 564d01fc9266ee9d08f267d398c2d9eb3c20db53
parent a2d9704cff4afc54b14b2fc024148b48695d74ae

Redefine meaning of DAB/FM linking.

Bug: 69958423
Test: VTS
Change-Id: I0ab4ddd6fc34f12720085cca9d0b821ec660a5c8

broadcastradio/2.0/types.hal

diff --git a/broadcastradio/2.0/types.hal b/broadcastradio/2.0/types.hal
index fc5809f..dacc820 100644
--- a/broadcastradio/2.0/types.hal
+++ b/broadcastradio/2.0/types.hal
@@ -86,21 +86,17 @@
      */
     RDS_REG,
 
-    /**
-     * Enables DAB implicit linking, based on program identifiers
-     * (DAB SId, RDS PI).
-     */
-    DAB_IMPLICIT_LINKING,
+    /** Enables DAB-DAB hard- and implicit-linking (the same content). */
+    DAB_DAB_LINKING,
 
-    /**
-     * Enables DAB hard linking (the same content).
-     */
-    DAB_HARD_LINKING,
+    /** Enables DAB-FM hard- and implicit-linking (the same content). */
+    DAB_FM_LINKING,
 
-    /**
-     * Enables DAB hard linking (related content).
-     */
-    DAB_SOFT_LINKING,
+    /** Enables DAB-DAB soft-linking (related content). */
+    DAB_DAB_SOFT_LINKING,
+
+    /** Enables DAB-FM soft-linking (related content). */
+    DAB_FM_SOFT_LINKING,
 };
 
 /**

broadcastradio/2.0/vts/functional/VtsHalBroadcastradioV2_0TargetTest.cpp

diff --git a/broadcastradio/2.0/vts/functional/VtsHalBroadcastradioV2_0TargetTest.cpp b/broadcastradio/2.0/vts/functional/VtsHalBroadcastradioV2_0TargetTest.cpp
index d0e4144..c9e83f0 100644
--- a/broadcastradio/2.0/vts/functional/VtsHalBroadcastradioV2_0TargetTest.cpp
+++ b/broadcastradio/2.0/vts/functional/VtsHalBroadcastradioV2_0TargetTest.cpp
@@ -58,9 +58,15 @@
 }  // namespace timeout
 
 static const ConfigFlag gConfigFlagValues[] = {
-    ConfigFlag::FORCE_MONO,       ConfigFlag::FORCE_ANALOG,     ConfigFlag::FORCE_DIGITAL,
-    ConfigFlag::RDS_AF,           ConfigFlag::RDS_REG,          ConfigFlag::DAB_IMPLICIT_LINKING,
-    ConfigFlag::DAB_HARD_LINKING, ConfigFlag::DAB_SOFT_LINKING,
+    ConfigFlag::FORCE_MONO,
+    ConfigFlag::FORCE_ANALOG,
+    ConfigFlag::FORCE_DIGITAL,
+    ConfigFlag::RDS_AF,
+    ConfigFlag::RDS_REG,
+    ConfigFlag::DAB_DAB_LINKING,
+    ConfigFlag::DAB_FM_LINKING,
+    ConfigFlag::DAB_DAB_SOFT_LINKING,
+    ConfigFlag::DAB_FM_SOFT_LINKING,
 };
 
 struct TunerCallbackMock : public ITunerCallback {