diff options
author | Jeff Brown <jeffbrown@google.com> | 2011-10-12 15:41:34 -0700 |
---|---|---|
committer | Jeff Brown <jeffbrown@google.com> | 2011-10-12 22:19:41 -0700 |
commit | 3e2fb7056ab4f459c63c6204d60abd537adf8442 (patch) | |
tree | 9c7144aa9c9afb225c60dc582c89fa8407560645 | |
parent | d16b0945e2a9b5258045c92c7989fa373be35cf2 (diff) | |
download | frameworks_native-3e2fb7056ab4f459c63c6204d60abd537adf8442.zip frameworks_native-3e2fb7056ab4f459c63c6204d60abd537adf8442.tar.gz frameworks_native-3e2fb7056ab4f459c63c6204d60abd537adf8442.tar.bz2 |
Deprecate local-only CursorWindows.
There is no difference and has never really been a difference
between local-only and remotable CursorWindows. By removing the
distinction officially in the API, we will make it easier to
implement CrossProcessCursor correctly. CrossProcessCursor
is problematic currently because it's not clear whether a call
to getWindow() will return a local-only window or a remotable window.
As a result, the bulk cursor adaptor has special case handling
for AbstractWindowedCursors vs. ordinary CrossProcessCursors
so that it can set a remotable window before the cursor fills it.
All these problems go away if we just forget about local-only
windows being special in any way.
Change-Id: Ie59f517968e33d0ecb239c3c4f60206495e8f376
-rw-r--r-- | include/binder/CursorWindow.h | 3 | ||||
-rw-r--r-- | libs/binder/CursorWindow.cpp | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/include/binder/CursorWindow.h b/include/binder/CursorWindow.h index 5d490ed..f0284de 100644 --- a/include/binder/CursorWindow.h +++ b/include/binder/CursorWindow.h @@ -80,8 +80,7 @@ public: ~CursorWindow(); - static status_t create(const String8& name, size_t size, bool localOnly, - CursorWindow** outCursorWindow); + static status_t create(const String8& name, size_t size, CursorWindow** outCursorWindow); static status_t createFromParcel(Parcel* parcel, CursorWindow** outCursorWindow); status_t writeToParcel(Parcel* parcel); diff --git a/libs/binder/CursorWindow.cpp b/libs/binder/CursorWindow.cpp index 1b85a71..bf8d7a6 100644 --- a/libs/binder/CursorWindow.cpp +++ b/libs/binder/CursorWindow.cpp @@ -40,11 +40,9 @@ CursorWindow::~CursorWindow() { ::close(mAshmemFd); } -status_t CursorWindow::create(const String8& name, size_t size, bool localOnly, - CursorWindow** outCursorWindow) { +status_t CursorWindow::create(const String8& name, size_t size, CursorWindow** outCursorWindow) { String8 ashmemName("CursorWindow: "); ashmemName.append(name); - ashmemName.append(localOnly ? " (local)" : " (remote)"); status_t result; int ashmemFd = ashmem_create_region(ashmemName.string(), size); |