commit 8fa6247f5563798836bfe582e0ab6eda073c2cad
author Siarhei Vishniakou <svv@google.com> Fri Aug 10 12:34:22 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 10 12:34:22 2018 -0700
tree 09f521525c6d5b3fe40e8ca2db4344cd064ac24a
parent 1da86f48a39a9819a214dd03da20b32796aba96b
parent 199a5a690ee9cab89677c669495d14ed2dde8836

Merge "Fix questionable condition" am: a74f830091
am: 199a5a690e

Change-Id: I38e5ae45797364a7af1b4aee37179bdef200f354

services/inputflinger/InputReader.cpp

diff --git a/services/inputflinger/InputReader.cpp b/services/inputflinger/InputReader.cpp
index e0cd8a0..21a9bce 100644
--- a/services/inputflinger/InputReader.cpp
+++ b/services/inputflinger/InputReader.cpp
@@ -3018,7 +3018,7 @@
     if (!changes) {
         mRotaryEncoderScrollAccumulator.configure(getDevice());
     }
-    if (!changes || (InputReaderConfiguration::CHANGE_DISPLAY_INFO)) {
+    if (!changes || (changes & InputReaderConfiguration::CHANGE_DISPLAY_INFO)) {
         DisplayViewport v;
         if (config->getDisplayViewport(ViewportType::VIEWPORT_INTERNAL, NULL, &v)) {
             mOrientation = v.orientation;