commit 750c7f4b2c5077d7f62401f84689b6e4c0a5abeb
author Garfield Tan <xutan@google.com> Mon May 18 17:41:46 2020 -0700
committer Garfield Tan <xutan@google.com> Mon May 18 17:41:46 2020 -0700
tree 0c0ebdeccd35d589d57263f31732897fb140de6c
parent 28f3700deeeea737b05f523b64e1ab1f42a219ec

Avoid shifting 1s into size bit.

Shifting 1 into size bit of sized integers is undefined until C++20, so
let's avoid undefined behavior.

Bug: None
Test: Event ID in systrace seems to bear correct source bits.
Change-Id: Id2ef5dc05a744476a713a111678dea966f1a5e32

include/input/Input.h

diff --git a/include/input/Input.h b/include/input/Input.h
index 9e47318..7dcbaf0 100644
--- a/include/input/Input.h
+++ b/include/input/Input.h
@@ -280,9 +280,9 @@
 public:
     // Used to divide integer space to ensure no conflict among these sources./
     enum class Source : int32_t {
-        INPUT_READER = 0x0 << SOURCE_SHIFT,
-        INPUT_DISPATCHER = 0x1 << SOURCE_SHIFT,
-        OTHER = 0x3 << SOURCE_SHIFT, // E.g. app injected events
+        INPUT_READER = static_cast<int32_t>(0x0u << SOURCE_SHIFT),
+        INPUT_DISPATCHER = static_cast<int32_t>(0x1u << SOURCE_SHIFT),
+        OTHER = static_cast<int32_t>(0x3u << SOURCE_SHIFT), // E.g. app injected events
     };
     IdGenerator(Source source);
 
@@ -294,7 +294,7 @@
 private:
     const Source mSource;
 
-    static constexpr int32_t SOURCE_MASK = 0x3 << SOURCE_SHIFT;
+    static constexpr int32_t SOURCE_MASK = static_cast<int32_t>(0x3u << SOURCE_SHIFT);
 };
 
 /**