Merge "Redefine meaning of DAB/FM linking." (56170053) · Commits · e / os / android_hardware_interfaces

broadcastradio/2.0/types.hal

+9 −13

Original line number	Diff line number	Diff line
		@@ -86,21 +86,17 @@ enum ConfigFlag : uint32_t {
		*/
		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,
		};

		/**

+9 −3

Original line number	Diff line number	Diff line
		@@ -58,9 +58,15 @@ static constexpr auto tune = 30s;
		} // 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 {