Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s/displayID/displayId

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

Bug: 254277939
Test: compiles
Change-Id: I7f71e12d48cf76ec8ff8fbaa435c18f9c2277096
This commit is contained in:
Michael Wright
2022-10-22 03:23:55 +01:00
parent 8357775f16
commit 21401ad9c0
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libs/input/PointerController.cpp
View File

@@ -231,7 +231,7 @@ void PointerController::clearSpots() {
}
void PointerController::clearSpotsLocked() {
for (auto& [displayID, spotController] : mLocked.spotControllers) {
for (auto& [displayId, spotController] : mLocked.spotControllers) {
spotController.clearSpots();
}
}
@@ -243,7 +243,7 @@ void PointerController::setInactivityTimeout(InactivityTimeout inactivityTimeout
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 @@ void PointerController::onDisplayViewportsUpdated(std::vector<DisplayViewport>&
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;