From 60b3053221448be3969332a666c7c3779b327b1b Mon Sep 17 00:00:00 2001 From: Hector Dearman Date: Wed, 16 Jan 2019 18:20:56 +0000 Subject: [PATCH] Remove DropBoxManager::getNextEntry - Remove DropBoxManager::getNextEntry as the method was unused. - Stop DropBoxManager::Entry inheriting from RefBase. This was causing bugs since DropBoxManager constructs Entry on the stack (in a non-ref counted context). Bug: 119655216 Test: make Change-Id: If0852ab6bcc1a92560132628897977eac16fddea --- libs/services/include/android/os/DropBoxManager.h | 5 +---- libs/services/src/os/DropBoxManager.cpp | 11 ----------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/libs/services/include/android/os/DropBoxManager.h b/libs/services/include/android/os/DropBoxManager.h index 75b26c626d149..07472435d8a37 100644 --- a/libs/services/include/android/os/DropBoxManager.h +++ b/libs/services/include/android/os/DropBoxManager.h @@ -62,7 +62,7 @@ public: // file descriptor. Status addFile(const String16& tag, int fd, int flags); - class Entry : public virtual RefBase, public Parcelable { + class Entry : public Parcelable { public: Entry(); virtual ~Entry(); @@ -89,9 +89,6 @@ public: friend class DropBoxManager; }; - // Get the next entry from the drop box after the specified time. - Status getNextEntry(const String16& tag, long msec, Entry* entry); - private: enum { HAS_BYTE_ARRAY = 8 diff --git a/libs/services/src/os/DropBoxManager.cpp b/libs/services/src/os/DropBoxManager.cpp index 8282518f75c64..681d5f780739d 100644 --- a/libs/services/src/os/DropBoxManager.cpp +++ b/libs/services/src/os/DropBoxManager.cpp @@ -228,15 +228,4 @@ DropBoxManager::add(const Entry& entry) return service->add(entry); } -Status -DropBoxManager::getNextEntry(const String16& tag, long msec, Entry* entry) -{ - sp service = interface_cast( - defaultServiceManager()->getService(android::String16("dropbox"))); - if (service == NULL) { - return Status::fromExceptionCode(Status::EX_NULL_POINTER, "can't find dropbox service"); - } - return service->getNextEntry(tag, msec, android::String16("android"), entry); -} - }} // namespace android::os