From cd8caa48800b41e9b2364f17af700b7a8c60869c Mon Sep 17 00:00:00 2001
From: Nikolas Havrikov <havrikov@google.com>
Date: Wed, 4 Jan 2023 17:30:19 +0100
Subject: [PATCH] Start consumer_ir service only when supported

This service is only useful when the FEATURE_CONSUMER_IR is enabled

Test: flash and use IR remote with Android TV
Bug: 264411203
Change-Id: I7127d918f9c4d507773db3613a91206ba6f6aeb8
---
 services/java/com/android/server/SystemServer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index b93350893a817..492d477fe23a4 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1559,7 +1559,7 @@ public final class SystemServer implements Dumpable {
             ServiceManager.addService("dynamic_system", dynamicSystem);
             t.traceEnd();
 
-            if (!isWatch) {
+            if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CONSUMER_IR)) {
                 t.traceBegin("StartConsumerIrService");
                 consumerIr = new ConsumerIrService(context);
                 ServiceManager.addService(Context.CONSUMER_IR_SERVICE, consumerIr);