From 1f9a36e283713c5034daa437382246b7888ad295 Mon Sep 17 00:00:00 2001
From: Nikolas Havrikov <havrikov@google.com>
Date: Wed, 11 Jan 2023 17:26:03 +0100
Subject: Do not start DockObserver on TV

Test: build+flash, wait for launcher, inspect logcat for related errors
Bug: 264411203
Change-Id: I2d57a2ef31a85379f0693c50d2d495a8e5d016b2
---
 services/java/com/android/server/SystemServer.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index edfe95efe7f9..4c316450bc1c 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -2200,9 +2200,11 @@ public final class SystemServer implements Dumpable {
                 t.traceEnd();
             }
 
-            t.traceBegin("StartDockObserver");
-            mSystemServiceManager.startService(DockObserver.class);
-            t.traceEnd();
+            if (!isTv) {
+                t.traceBegin("StartDockObserver");
+                mSystemServiceManager.startService(DockObserver.class);
+                t.traceEnd();
+            }
 
             if (isWatch) {
                 t.traceBegin("StartThermalObserver");
-- 
cgit v1.2.3-59-g8ed1b