Skip to content

Commit 8aeb1de

Browse files
author
Steven Moreland
committed
libbinder: remove unique_ptr FD APIs.
There are many deprecated APIs here, and mkate@'s data indicates they aren't used. Going ahead and trying to remove one of them to see what happens. Bug: N/A Test: N/A Change-Id: I91b38fbe88a6e4ece3d261f32e93f45de2a6a0fb
1 parent 38a4ab9 commit 8aeb1de

3 files changed

Lines changed: 0 additions & 16 deletions

File tree

libs/binder/Parcel.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1314,10 +1314,6 @@ status_t Parcel::writeUniqueFileDescriptorVector(const std::vector<unique_fd>& v
13141314
status_t Parcel::writeUniqueFileDescriptorVector(const std::optional<std::vector<unique_fd>>& val) {
13151315
return writeData(val);
13161316
}
1317-
status_t Parcel::writeUniqueFileDescriptorVector(
1318-
const std::unique_ptr<std::vector<unique_fd>>& val) {
1319-
return writeData(val);
1320-
}
13211317

13221318
status_t Parcel::writeStrongBinderVector(const std::vector<sp<IBinder>>& val) { return writeData(val); }
13231319
status_t Parcel::writeStrongBinderVector(const std::optional<std::vector<sp<IBinder>>>& val) { return writeData(val); }
@@ -1373,10 +1369,6 @@ status_t Parcel::readUtf8VectorFromUtf16Vector(std::vector<std::string>* val) co
13731369
status_t Parcel::readUniqueFileDescriptorVector(std::optional<std::vector<unique_fd>>* val) const {
13741370
return readData(val);
13751371
}
1376-
status_t Parcel::readUniqueFileDescriptorVector(
1377-
std::unique_ptr<std::vector<unique_fd>>* val) const {
1378-
return readData(val);
1379-
}
13801372
status_t Parcel::readUniqueFileDescriptorVector(std::vector<unique_fd>* val) const {
13811373
return readData(val);
13821374
}

libs/binder/include/binder/Parcel.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -383,9 +383,6 @@ class Parcel {
383383
LIBBINDER_EXPORTED status_t
384384
writeUniqueFileDescriptorVector(const std::optional<std::vector<binder::unique_fd>>& val);
385385
LIBBINDER_EXPORTED status_t
386-
writeUniqueFileDescriptorVector(const std::unique_ptr<std::vector<binder::unique_fd>>& val)
387-
__attribute__((deprecated("use std::optional version instead")));
388-
LIBBINDER_EXPORTED status_t
389386
writeUniqueFileDescriptorVector(const std::vector<binder::unique_fd>& val);
390387

391388
// Writes a blob to the parcel.
@@ -626,9 +623,6 @@ class Parcel {
626623
LIBBINDER_EXPORTED status_t
627624
readUniqueFileDescriptorVector(std::optional<std::vector<binder::unique_fd>>* val) const;
628625
LIBBINDER_EXPORTED status_t
629-
readUniqueFileDescriptorVector(std::unique_ptr<std::vector<binder::unique_fd>>* val) const
630-
__attribute__((deprecated("use std::optional version instead")));
631-
LIBBINDER_EXPORTED status_t
632626
readUniqueFileDescriptorVector(std::vector<binder::unique_fd>* val) const;
633627

634628
// Reads a blob from the parcel.

libs/binder/tests/parcel_fuzzer/binder.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,6 @@ std::vector<ParcelRead<::android::Parcel>> BINDER_PARCEL_READ_FUNCTIONS {
318318
PARCEL_READ_NO_STATUS(int, readParcelFileDescriptor),
319319
PARCEL_READ_WITH_STATUS(unique_fd, readUniqueFileDescriptor),
320320

321-
PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<unique_fd>>,
322-
readUniqueFileDescriptorVector),
323321
PARCEL_READ_WITH_STATUS(std::optional<std::vector<unique_fd>>, readUniqueFileDescriptorVector),
324322
PARCEL_READ_WITH_STATUS(std::vector<unique_fd>, readUniqueFileDescriptorVector),
325323

0 commit comments

Comments
 (0)