summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2020-08-18 00:11:20 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-08-18 00:11:20 +0000
commit1a19435911704c8ef37741e5765df42ac9903e1d (patch)
tree096bc3678534bd2921f1a0ac7fd3c87666a55158
parent4fddd65fc74a747090c0076a538b658d2b3fd5ac (diff)
parent80245af0dfd5b9a76a5191cd73e66727ab33ab33 (diff)
Merge "libbinder: remove MemoryHeapBase::setDevice" am: 16794fd3fc am: 17800064e5 am: 9f4047c77a am: 9b3236fd0c am: 80245af0df
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1402750 Change-Id: I0ea1126e83ea93514d17d2485b6cef2f69de7ed1
-rw-r--r--libs/binder/include/binder/MemoryHeapBase.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/libs/binder/include/binder/MemoryHeapBase.h b/libs/binder/include/binder/MemoryHeapBase.h
index edada3d1b5..52bd5decd4 100644
--- a/libs/binder/include/binder/MemoryHeapBase.h
+++ b/libs/binder/include/binder/MemoryHeapBase.h
@@ -71,14 +71,6 @@ public:
/* this closes this heap -- use carefully */
void dispose();
- /* this is only needed as a workaround, use only if you know
- * what you are doing */
- status_t setDevice(const char* device) {
- if (mDevice == nullptr)
- mDevice = device;
- return mDevice ? NO_ERROR : ALREADY_EXISTS;
- }
-
protected:
MemoryHeapBase();
// init() takes ownership of fd