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

Merge "SystemServer: add isWatch guard for Twilight & WiredAccessory"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-11-17 17:00:50 +00:00
committed by Android (Google) Code Review
parent 15cd688ea7 c8baee4b2f
commit 85b0025008
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2124,15 +2124,17 @@ public final class SystemServer implements Dumpable {
t.traceEnd();
}
t.traceBegin("StartWiredAccessoryManager");
try {
// Listen for wired headset changes
inputManager.setWiredAccessoryCallbacks(
new WiredAccessoryManager(context, inputManager));
} catch (Throwable e) {
reportWtf("starting WiredAccessoryManager", e);
if (!isWatch) {
t.traceBegin("StartWiredAccessoryManager");
try {
// Listen for wired headset changes
inputManager.setWiredAccessoryCallbacks(
new WiredAccessoryManager(context, inputManager));
} catch (Throwable e) {
reportWtf("starting WiredAccessoryManager", e);
}
t.traceEnd();
}
t.traceEnd();
if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_MIDI)) {
// Start MIDI Manager service
@@ -2181,10 +2183,12 @@ public final class SystemServer implements Dumpable {
Slog.e(TAG, "Failure starting HardwarePropertiesManagerService", e);
}
t.traceEnd();
t.traceBegin("StartTwilightService");
mSystemServiceManager.startService(TwilightService.class);
t.traceEnd();
if (!isWatch) {
t.traceBegin("StartTwilightService");
mSystemServiceManager.startService(TwilightService.class);
t.traceEnd();
}
t.traceBegin("StartColorDisplay");
mSystemServiceManager.startService(ColorDisplayService.class);