commit 21401ad9c017b49614743b16164ef4dba5899563
author Michael Wright <michaelwr@google.com> Sat Oct 22 03:23:55 2022 +0100
committer Michael Wright <michaelwr@google.com> Fri Nov 11 14:04:13 2022 +0000
tree 8ac1a81b06a4fa84e79c68b299f86f15d5625376
parent 8357775f16a66d973bb056b277ab4ca125c15544

s/displayID/displayId

Update local variable names in PointerController so they match the
general code style.

Bug: 254277939
Test: compiles
Change-Id: I7f71e12d48cf76ec8ff8fbaa435c18f9c2277096

libs/input/PointerController.cpp

diff --git a/libs/input/PointerController.cpp b/libs/input/PointerController.cpp
index 3ae6131..1f80ba9 100644
--- a/libs/input/PointerController.cpp
+++ b/libs/input/PointerController.cpp
@@ -231,7 +231,7 @@
 }
 
 void PointerController::clearSpotsLocked() {
-    for (auto& [displayID, spotController] : mLocked.spotControllers) {
+    for (auto& [displayId, spotController] : mLocked.spotControllers) {
         spotController.clearSpots();
     }
 }
@@ -243,7 +243,7 @@
 void PointerController::reloadPointerResources() {
     std::scoped_lock lock(getLock());
 
-    for (auto& [displayID, spotController] : mLocked.spotControllers) {
+    for (auto& [displayId, spotController] : mLocked.spotControllers) {
         spotController.reloadSpotResources();
     }
 
@@ -294,13 +294,13 @@
 
     std::scoped_lock lock(getLock());
     for (auto it = mLocked.spotControllers.begin(); it != mLocked.spotControllers.end();) {
-        int32_t displayID = it->first;
-        if (!displayIdSet.count(displayID)) {
+        int32_t displayId = it->first;
+        if (!displayIdSet.count(displayId)) {
             /*
              * Ensures that an in-progress animation won't dereference
              * a null pointer to TouchSpotController.
              */
-            mContext.removeAnimationCallback(displayID);
+            mContext.removeAnimationCallback(displayId);
             it = mLocked.spotControllers.erase(it);
         } else {
             ++it;