commit 9f0a4008b72138f6279a12f474b60e5e3caa13c3
author Ady Abraham <adyabr@google.com> Mon Oct 05 15:47:26 2020 -0700
committer Ady Abraham <adyabr@google.com> Tue Oct 06 01:36:33 2020 +0000
tree 08fdda2d9313e34f081cc79888d081449434c2aa
parent 4e9769a7ccef89ecf4dce68ca90f4319d688c608

SurfaceFLinger: rename outLayerId

 - Rename outId to outLayerId to reflect what the Id is.
 - Remove the default value and require it to be non-nullptr

Test: SF tests
Change-Id: Icdbbab4a84e9bd5982d274ee5bf522e36545855a

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index bf33e5e..498859b 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3846,7 +3846,7 @@
 }
 
 status_t SurfaceFlinger::mirrorLayer(const sp<Client>& client, const sp<IBinder>& mirrorFromHandle,
-                                     sp<IBinder>* outHandle, int32_t* outId) {
+                                     sp<IBinder>* outHandle, int32_t* outLayerId) {
     if (!mirrorFromHandle) {
         return NAME_NOT_FOUND;
     }
@@ -3871,7 +3871,7 @@
         mirrorLayer->mClonedChild = mirrorFrom->createClone();
     }
 
-    *outId = mirrorLayer->sequence;
+    *outLayerId = mirrorLayer->sequence;
     return addClientLayer(client, *outHandle, nullptr, mirrorLayer, nullptr, nullptr, false,
                           nullptr /* outTransformHint */);
 }
@@ -3880,8 +3880,8 @@
                                      uint32_t h, PixelFormat format, uint32_t flags,
                                      LayerMetadata metadata, sp<IBinder>* handle,
                                      sp<IGraphicBufferProducer>* gbp,
-                                     const sp<IBinder>& parentHandle, const sp<Layer>& parentLayer,
-                                     int32_t* outId, uint32_t* outTransformHint) {
+                                     const sp<IBinder>& parentHandle, int32_t* outLayerId,
+                                     const sp<Layer>& parentLayer, uint32_t* outTransformHint) {
     if (int32_t(w|h) < 0) {
         ALOGE("createLayer() failed, w or h is negative (w=%d, h=%d)",
                 int(w), int(h));
@@ -3947,9 +3947,7 @@
     mInterceptor->saveSurfaceCreation(layer);
 
     setTransactionFlags(eTransactionNeeded);
-    if (outId) {
-        *outId = layer->sequence;
-    }
+    *outLayerId = layer->sequence;
     return result;
 }