commit a74f830091a369432afedc9838a1cfe1a755037e
author Treehugger Robot <treehugger-gerrit@google.com> Fri Aug 10 17:58:59 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 10 17:58:59 2018 +0000
tree 68bd18332d8a661b743fcad8614d722ca1ec550f
parent cfb8d9931bae16fe9239c4befbfed85ab96d4a2f
parent ce0823c786370eb6b39d3c35d81eb81ae0168989

Merge "Fix questionable condition"

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;