From bae1b24ba306793ca2d86aa80552bd79e0e54742 Mon Sep 17 00:00:00 2001
From: Courtney Goeltzenleuchter <courtneygo@google.com>
Date: Mon, 9 Oct 2017 17:13:47 -0600
Subject: [PATCH] Check system support of wide-color

getContext().getDisplay().isWideColorGamut() does not check system
support of wide-color. That's window.isWideColor().
No window object handy so call isScreenWideColorGamut() to
verify system support for wide-color as well.

Bug: 64801219
Bug: 67488442
Test: manual, check Developer Settings for Color Mode
option on Pixel or Pixel XL.

Change-Id: If28e52da174dd460850bc84744818979f52add78
---
 src/com/android/settings/development/DevelopmentSettings.java   | 2 +-
 .../development/PictureColorModePreferenceController.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/development/DevelopmentSettings.java b/src/com/android/settings/development/DevelopmentSettings.java
index 980d976f5a7..729864c9793 100644
--- a/src/com/android/settings/development/DevelopmentSettings.java
+++ b/src/com/android/settings/development/DevelopmentSettings.java
@@ -545,7 +545,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
         mColorModePreference = (ColorModePreference) findPreference(KEY_COLOR_MODE);
         mColorModePreference.updateCurrentAndSupported();
         if (mColorModePreference.getColorModeCount() < 2 ||
-                getContext().getDisplay().isWideColorGamut()) {
+                getContext().getResources().getConfiguration().isScreenWideColorGamut()) {
             removePreference(KEY_COLOR_MODE);
             mColorModePreference = null;
         }
diff --git a/src/com/android/settings/development/PictureColorModePreferenceController.java b/src/com/android/settings/development/PictureColorModePreferenceController.java
index 07df1e9e885..8fa94af6e75 100644
--- a/src/com/android/settings/development/PictureColorModePreferenceController.java
+++ b/src/com/android/settings/development/PictureColorModePreferenceController.java
@@ -91,7 +91,7 @@ public class PictureColorModePreferenceController extends
 
     @VisibleForTesting
     boolean isWideColorGamut() {
-        return mContext.getDisplay().isWideColorGamut();
+        return mContext.getResources().getConfiguration().isScreenWideColorGamut();
     }
 
     @VisibleForTesting