commit c5eb827325e05cb47b1437c633ff29e1ff16b00f
author Amy Zhang <amyjojo@google.com> Mon Mar 01 16:19:39 2021 -0800
committer Amy Zhang <amyjojo@google.com> Tue Mar 02 22:52:13 2021 +0000
tree e88a7b21d1e263ddec4366c38a221afe8ff1b774
parent ab8e76c8d6e7e36625021ccb2af51f0b62ff1a2e

Check if the tuner feature is supported before waiting for the TRM
service

Test: local tested on Cuttlefish
Bug: 181350336
Change-Id: Id1b3a484cff5b907ac0bad770498fb744d50ac95

services/tuner/TunerService.h

diff --git a/services/tuner/TunerService.h b/services/tuner/TunerService.h
index 0570681..f8e2ee6 100644
--- a/services/tuner/TunerService.h
+++ b/services/tuner/TunerService.h
@@ -72,6 +72,8 @@
 const static int TUNER_HAL_VERSION_UNKNOWN = 0;
 const static int TUNER_HAL_VERSION_1_0 = 1 << 16;
 const static int TUNER_HAL_VERSION_1_1 = (1 << 16) | 1;
+// System Feature defined in PackageManager
+static const ::android::String16 FEATURE_TUNER(::android::String16("android.hardware.tv.tuner"));
 
 typedef enum {
     FRONTEND,