commit 6b40b59d99e36ab8b83d312a35dbf364946fd728
author Steven Moreland <smoreland@google.com> Wed Jul 10 10:54:11 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jul 10 10:54:11 2019 -0700
tree 45dd6ceb8e3107f1ee34db6c887c7e33b32c6223
parent 16fba9486da3d12e9db81cc202bf4ef73f17c748
parent 6915a76f1d5c6a098579e11984ee773c52bd88d0

Merge "Hold onto linked binder." am: 5e343ea8db
am: 6915a76f1d

Change-Id: Ib1ab9dc28081d9e911441a3476edfc75c0b6fac6

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 2d31910..9c8251f 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -529,9 +529,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));
     }
     sp<IBinder> input(defaultServiceManager()->getService(
             String16("inputflinger")));

services/surfaceflinger/SurfaceFlinger.h

diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index ddfe88c..c5c4103 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -1084,6 +1084,9 @@
     // either AID_GRAPHICS or AID_SYSTEM.
     status_t CheckTransactCodeCredentials(uint32_t code);
 
+    // to linkToDeath
+    sp<IBinder> mWindowManager;
+
     std::unique_ptr<dvr::VrFlinger> mVrFlinger;
     std::atomic<bool> mVrFlingerRequestsDisplay = false;
     static bool useVrFlinger;