commit 4d4c2757b01ba72e17eb2ef6b8cc23158dafa9d7
author Eino-Ville Talvala <etalvala@google.com> Wed Mar 21 20:34:29 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 21 20:34:29 2018 +0000
tree 486002d7780d47b22477ec9ebbcbb389c5ee39ff
parent 27fd1adc339b992dfa0d06a2a513e5a5ba81c829
parent 100697d60c71131ea6f97b2374311e2eb593be90

Merge "ActivityManager: Add link/unlinkToDeath" into pi-dev
am: 100697d60c

Change-Id: I053e18145da0b87f8c5f8877190b66c5e65fb068

libs/binder/ActivityManager.cpp

diff --git a/libs/binder/ActivityManager.cpp b/libs/binder/ActivityManager.cpp
index e1cc5da..9adac26 100644
--- a/libs/binder/ActivityManager.cpp
+++ b/libs/binder/ActivityManager.cpp
@@ -80,4 +80,20 @@
     }
 }
 
+status_t ActivityManager::linkToDeath(const sp<IBinder::DeathRecipient>& recipient) {
+    sp<IActivityManager> service = getService();
+    if (service != NULL) {
+        return IInterface::asBinder(service)->linkToDeath(recipient);
+    }
+    return INVALID_OPERATION;
+}
+
+status_t ActivityManager::unlinkToDeath(const sp<IBinder::DeathRecipient>& recipient) {
+    sp<IActivityManager> service = getService();
+    if (service != NULL) {
+        return IInterface::asBinder(service)->unlinkToDeath(recipient);
+    }
+    return INVALID_OPERATION;
+}
+
 }; // namespace android

libs/binder/include/binder/ActivityManager.h

diff --git a/libs/binder/include/binder/ActivityManager.h b/libs/binder/include/binder/ActivityManager.h
index 408c428..397382f 100644
--- a/libs/binder/include/binder/ActivityManager.h
+++ b/libs/binder/include/binder/ActivityManager.h
@@ -51,6 +51,9 @@
                              const String16& callingPackage);
     void unregisterUidObserver(const sp<IUidObserver>& observer);
 
+    status_t linkToDeath(const sp<IBinder::DeathRecipient>& recipient);
+    status_t unlinkToDeath(const sp<IBinder::DeathRecipient>& recipient);
+
 private:
     Mutex mLock;
     sp<IActivityManager> mService;