Merge "Do not start DockObserver on TV" into udc-dev

2023-03-13 08:04:18 +00:00
parent 608fa1fd94 1f9a36e283
commit 5ebe0d42a2
1 changed files with 5 additions and 3 deletions
--- 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");