commit c49b73ca8f69ab43923c3c414e94565c9e1133f4
author Siarhei Vishniakou <svv@google.com> Fri Aug 10 13:05:29 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 10 13:05:29 2018 -0700
tree ba006121190913b06343bb3b9aeeb4138dd5deab
parent 26b953097b0fb1b0ab9382e974e4c76e0e72fc49
parent 8fa6247f5563798836bfe582e0ab6eda073c2cad

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

Change-Id: Ie3d62cd0380b80ba5bdcef405fb9a8739574a760

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;