From c8baee4b2f25f47434513cdf1437521106571357 Mon Sep 17 00:00:00 2001
From: Julius D'souza <jdsouza@google.com>
Date: Thu, 30 May 2019 14:56:11 -0700
Subject: [PATCH] SystemServer: add isWatch guard for Twilight & WiredAccessory

The following services are disabled for watches
* TwilightService - there is no night mode equivalent in Wear
* WiredAccessoryManager - watches have no wired inputs

Bug: 132729373
Change-Id: Ib118532931334528527f8a29bd0cd47639eecf95
Signed-off-by: Julius D'souza <jdsouza@google.com>
(cherry picked from commit 94cbb8e821f8ad8031b936d7feb95f85954722c7)
(cherry picked from commit 3b7f73a984e301d6574e800bbf069e507cf0319f)
---
 .../java/com/android/server/SystemServer.java | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 752ad0b9c48a0..3adb51eb5c15f 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -2123,15 +2123,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
@@ -2180,10 +2182,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);