| commit | 9f4047c77a67d9feb7c96ea31c0364a17624f04b | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Mon Aug 17 23:34:01 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 17 23:34:01 2020 +0000 |
| tree | f22045c60d4a4bd6d71295972f22957bba97dfb6 | |
| parent | 6b35867b33d89242c474ba6b1083a782ead0f009 [diff] | |
| parent | 17800064e58284403a930224e42e1d41bd60d58b [diff] |
Merge "libbinder: remove MemoryHeapBase::setDevice" am: 16794fd3fc am: 17800064e5 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1402750 Change-Id: I5dc2488e8f1e7bef9a3b1bf3068db42177b6bf65
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