commit eecd6597d013b2bb879bc51957ed1b5e6b61c35e
author Dominik Laskowski <domlaskowski@google.com> Tue May 29 10:25:41 2018 -0700
committer Dominik Laskowski <domlaskowski@google.com> Thu May 31 14:34:22 2018 -0700
tree 5951b1d466e39561ce064a5abf18e5638a19c48d
parent ba65e2d216021c37f8ba40dcab772e092e0e6740

SF: Use consistent names for display references

This CL renames IBinder tokens to "displayToken", and DisplayDevice
references to "display". It also cleans up style for affected lines.

Bug: 74619554
Test: Build
Change-Id: I04fc7264bf2a856caf30d662029b6f603f432938

services/surfaceflinger/DisplayHardware/HWComposer.cpp

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index 98831b3..9f1e714 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -431,11 +431,11 @@
     return NO_ERROR;
 }
 
-status_t HWComposer::prepare(DisplayDevice& displayDevice) {
+status_t HWComposer::prepare(DisplayDevice& display) {
     ATRACE_CALL();
 
     Mutex::Autolock _l(mDisplayLock);
-    auto displayId = displayDevice.getHwcDisplayId();
+    auto displayId = display.getHwcDisplayId();
     if (displayId == DisplayDevice::DISPLAY_ID_INVALID) {
         ALOGV("Skipping HWComposer prepare for non-HWC display");
         return NO_ERROR;
@@ -502,7 +502,7 @@
 
     displayData.hasClientComposition = false;
     displayData.hasDeviceComposition = false;
-    for (auto& layer : displayDevice.getVisibleLayersSortedByZ()) {
+    for (auto& layer : display.getVisibleLayersSortedByZ()) {
         auto hwcLayer = layer->getHwcLayer(displayId);
 
         if (changedTypes.count(hwcLayer) != 0) {