Merge "Start TunerResourceManager when FEATURE_TUNER is supported" into rvc-dev

1 files changed, 4 insertions, 0 deletions

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 0fc333f4b38c..fa3f33067e8e 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1891,6 +1891,10 @@ public final class SystemServer {
                     || mPackageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)) {
                 t.traceBegin("StartTvInputManager");
                 mSystemServiceManager.startService(TvInputManagerService.class);
+                t.traceEnd();
+            }
+
+            if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_TUNER)) {
                 t.traceBegin("StartTunerResourceManager");
                 mSystemServiceManager.startService(TunerResourceManagerService.class);
                 t.traceEnd();