diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-25 05:32:01 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-25 05:32:01 +0000 |
| commit | 16d7566d9d528550e06fb55598e8bb78f3ec87ba (patch) | |
| tree | cff84580a4644fc244c5819b4fc9a1634cccc4ed | |
| parent | 3fa31378bcae79e1c9ca016e74d470c20d510894 (diff) | |
| parent | 2a9859b572df6c09ffafacf3143e78a7759fdc52 (diff) | |
| download | base-16d7566d9d528550e06fb55598e8bb78f3ec87ba.tar.gz | |
Merge cherrypicks of [3122088, 3121430, 3119129, 3119130, 3119131, 3120667] into oc-mr1-release
Change-Id: I27e7d8f0f1dc1d73083eb6949e0c40d1ed77445c
| -rw-r--r-- | proto/src/metrics_constants.proto | 5 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto index 48f3b9ce9fb0..81a23f0afa3f 100644 --- a/proto/src/metrics_constants.proto +++ b/proto/src/metrics_constants.proto @@ -4562,6 +4562,11 @@ message MetricsEvent { // OS: O MR NOTIFICATION_SNOOZE_OPTIONS = 1142; + // OPEN: Settings > Display > Colors + // CATEGORY: SETTINGS + // OS: O MR + COLOR_MODE_SETTINGS = 1143; + // ---- End O-MR1 Constants, all O-MR1 constants go above this line ---- // Add new aosp constants above this line. diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 0abc84745f0e..f5cc43bd9019 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -7673,7 +7673,8 @@ public class WindowManagerService extends IWindowManager.Stub } boolean hasWideColorGamutSupport() { - return mHasWideColorGamutSupport; + return mHasWideColorGamutSupport && + !SystemProperties.getBoolean("persist.sys.sf.native_mode", false); } void updateNonSystemOverlayWindowsVisibilityIfNeeded(WindowState win, boolean surfaceShown) { |