commit a904bb9522b97c19acab9b67eb043549985cf857
author Steven Moreland <smoreland@google.com> Tue Jul 02 17:37:23 2019 -0700
committer Steven Moreland <smoreland@google.com> Mon Jul 08 23:13:48 2019 +0000
tree 7486b594bb34b67f88ecad780f19cc7fcc34d61b
parent e416f707865e0a5ffedf13a1c91495146adc895c

Hold onto linked binder.

unlinkToDeath is no longer required, (this change in behavior is to
avoid leaks) so holding onto window manager here (still calling
unlinkToDeath to avoid a log, but may for instance remove all
unlinkToDeath calls in the future).

Bug: 134576445
Test: boot
Change-Id: I78259964b564d87c4bb9be254ee46d3ce04db5ad

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 78d751a..629c6ca 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -494,9 +494,9 @@
 
     // wait patiently for the window manager death
     const String16 name("window");
-    sp<IBinder> window(defaultServiceManager()->getService(name));
-    if (window != 0) {
-        window->linkToDeath(static_cast<IBinder::DeathRecipient*>(this));
+    mWindowManager = defaultServiceManager()->getService(name);
+    if (mWindowManager != 0) {
+        mWindowManager->linkToDeath(static_cast<IBinder::DeathRecipient*>(this));
     }
 
     if (mVrFlinger) {