commit fe3de7d674585d6c95a4c0cfa2817a1edbcde6af
author Michael Wright <michaelwr@google.com> Thu Jul 02 19:05:30 2020 +0100
committer Michael Wright <michaelwr@google.com> Sun Jul 12 00:26:35 2020 +0000
tree 1271b079d9daccb7bb15701415e925c9b362d352
parent 227c554212c2ae783675b6623597035ef846027f

Rename ViewportTypes to avoid repetition

Bug: 160010896
Test: compiles, manual
Change-Id: Id94a671e9bf45b4c73016092757daf5809706d7f

services/inputflinger/reader/mapper/RotaryEncoderInputMapper.cpp

diff --git a/services/inputflinger/reader/mapper/RotaryEncoderInputMapper.cpp b/services/inputflinger/reader/mapper/RotaryEncoderInputMapper.cpp
index 9885889..594ff42 100644
--- a/services/inputflinger/reader/mapper/RotaryEncoderInputMapper.cpp
+++ b/services/inputflinger/reader/mapper/RotaryEncoderInputMapper.cpp
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
+// clang-format off
 #include "../Macros.h"
+// clang-format on
 
 #include "RotaryEncoderInputMapper.h"
 
@@ -66,7 +68,7 @@
     }
     if (!changes || (changes & InputReaderConfiguration::CHANGE_DISPLAY_INFO)) {
         std::optional<DisplayViewport> internalViewport =
-                config->getDisplayViewportByType(ViewportType::VIEWPORT_INTERNAL);
+                config->getDisplayViewportByType(ViewportType::INTERNAL);
         if (internalViewport) {
             mOrientation = internalViewport->orientation;
         } else {