| commit | 80245af0dfd5b9a76a5191cd73e66727ab33ab33 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Mon Aug 17 23:58:12 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 17 23:58:12 2020 +0000 |
| tree | 5c5dcffa60855054181b308574d4363ffccee9e2 | |
| parent | 149b19d97bc1dea015ef92efc2096a115e52cd57 [diff] | |
| parent | 9b3236fd0c4fbffe2068d51167f747c84e2ff066 [diff] |
Merge "libbinder: remove MemoryHeapBase::setDevice" am: 16794fd3fc am: 17800064e5 am: 9f4047c77a am: 9b3236fd0c Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1402750 Change-Id: Idb538cfcfd1811f93fbb3ff20fdb8ee00b6c182f
diff --git a/libs/binder/include/binder/MemoryHeapBase.h b/libs/binder/include/binder/MemoryHeapBase.h index edada3d..52bd5de 100644 --- a/libs/binder/include/binder/MemoryHeapBase.h +++ b/libs/binder/include/binder/MemoryHeapBase.h
@@ -71,14 +71,6 @@ /* 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