commit 190f51a1ce27e8ea60a0874706e6601598e2e60f
author Steven Moreland <smoreland@google.com> Fri Oct 06 20:01:18 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 06 20:01:18 2017 +0000
tree 16458a2891d9e17200a76db8e34138e3949d60e4
parent a8c0fef9fc9ef8c61ba60a779ab5e07f997ba794
parent 91ff38c988473ea4ce8b208d2f841a246995cb14

Use constant for cookie instead of value.
am: 91ff38c988

Change-Id: Ia01b458cf553abe4e041a937284e19504940d827

ServiceManager.cpp

diff --git a/ServiceManager.cpp b/ServiceManager.cpp
index 095c296..e3f3619 100644
--- a/ServiceManager.cpp
+++ b/ServiceManager.cpp
@@ -254,7 +254,7 @@
             ifaceMap.sendPackageRegistrationNotification(fqName, name);
         }
 
-        auto linkRet = service->linkToDeath(this, 0 /*cookie*/);
+        auto linkRet = service->linkToDeath(this, kServiceDiedCookie);
         linkRet.isOk(); // ignore
 
         isValidService = true;
@@ -362,7 +362,7 @@
     PackageInterfaceMap &ifaceMap = mServiceMap[fqName];
 
     if (name.empty()) {
-        auto ret = callback->linkToDeath(this, kPackageListenerDiedCookie /*cookie*/);
+        auto ret = callback->linkToDeath(this, kPackageListenerDiedCookie);
         if (!ret.isOk()) {
             LOG(ERROR) << "Failed to register death recipient for " << fqName << "/" << name;
             return false;