Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not start DockObserver on TV" into udc-dev am: 5ebe0d42a2

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

Change-Id: I4e2fa6888127480fa045fb3ae10da1dc1a048073
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Nikolas Havrikov
2023-03-13 08:38:45 +00:00
committed by Automerger Merge Worker
parent 6d0d0b9987 5ebe0d42a2
commit 64a0a5ae8d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/SystemServer.java
View File

@@ -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");