commit 17a9bc82b48297899589f1acb8bdf70ca06dd253
author Christine Franks <christyfranks@google.com> Mon Dec 10 10:19:02 2018 -0800
committer Christine Franks <christyfranks@google.com> Mon Dec 10 10:21:25 2018 -0800
tree 785be8728c9094bcd18dc99a185c133220b81b75
parent fdb30ae286ea2dd7435e12d64c09009c39e149ac

ColorDisplayService should always be started

Even if no color transforms are available, for requesting whether
color modes or configurations are available.

Bug: 111215474
Test: atest FrameworksServicesTest:ColorDisplayServiceTest

Change-Id: I10a4b3b1214920117312e752ba5ea0033ff70293

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

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index c4d2a91..26b91a9 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -36,7 +36,6 @@
 import android.content.res.Resources.Theme;
 import android.database.sqlite.SQLiteCompatibilityWalFlags;
 import android.database.sqlite.SQLiteGlobal;
-import android.hardware.display.ColorDisplayManager;
 import android.os.BaseBundle;
 import android.os.Binder;
 import android.os.Build;
@@ -1443,11 +1442,9 @@
             mSystemServiceManager.startService(TwilightService.class);
             traceEnd();
 
-            if (ColorDisplayManager.isNightDisplayAvailable(context)) {
-                traceBeginAndSlog("StartColorDisplay");
-                mSystemServiceManager.startService(ColorDisplayService.class);
-                traceEnd();
-            }
+            traceBeginAndSlog("StartColorDisplay");
+            mSystemServiceManager.startService(ColorDisplayService.class);
+            traceEnd();
 
             traceBeginAndSlog("StartJobScheduler");
             mSystemServiceManager.startService(JobSchedulerService.class);