Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6f63b66 authored by Nikolas Havrikov's avatar Nikolas Havrikov Committed by Automerger Merge Worker
Browse files

Merge "Do not start DockObserver on TV" into udc-dev am: 5ebe0d42 am: 2df251ab 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21920623



Change-Id: I51e8a4e1c21887f600800014dca889c4c8d7d939
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eb1a8a7e 2df251ab

services/java/com/android/server/SystemServer.java

+5 −3
Original line number Diff line number Diff line
@@ -2204,9 +2204,11 @@ public final class SystemServer implements Dumpable { 
                t.traceEnd();

            }



            if (!isTv) {

                t.traceBegin("StartDockObserver");

                mSystemServiceManager.startService(DockObserver.class);

                t.traceEnd();

            }



            if (isWatch) {

                t.traceBegin("StartThermalObserver");