Skip to content

Commit c863146

Browse files
Treehugger Robotandroid-build-merge-worker-robot
authored andcommitted
Merge "trusty: Don't generate errors for new lints in clang/LLVM 19" into main am: 17e176a am: 9838df8
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3453157 Change-Id: I21aa16d0a76de77634a123a78f6e2707475dd91e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2 parents d67998a + 9838df8 commit c863146

1 file changed

Lines changed: 8 additions & 1 deletion

File tree

libs/binder/Parcel.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -616,6 +616,7 @@ status_t Parcel::appendFrom(const Parcel* parcel, size_t offset, size_t len) {
616616
}
617617
#else
618618
LOG_ALWAYS_FATAL("Binder kernel driver disabled at build time");
619+
(void)kernelFields;
619620
return INVALID_OPERATION;
620621
#endif // BINDER_WITH_KERNEL_IPC
621622
} else {
@@ -797,6 +798,7 @@ std::vector<int> Parcel::debugReadAllFileDescriptors() const {
797798
setDataPosition(initPosition);
798799
#else
799800
LOG_ALWAYS_FATAL("Binder kernel driver disabled at build time");
801+
(void)kernelFields;
800802
#endif
801803
} else if (const auto* rpcFields = maybeRpcFields(); rpcFields && rpcFields->mFds) {
802804
for (const auto& fd : *rpcFields->mFds) {
@@ -839,9 +841,10 @@ status_t Parcel::hasBindersInRange(size_t offset, size_t len, bool* result) cons
839841
}
840842
#else
841843
LOG_ALWAYS_FATAL("Binder kernel driver disabled at build time");
844+
(void)kernelFields;
842845
return INVALID_OPERATION;
843846
#endif // BINDER_WITH_KERNEL_IPC
844-
} else if (const auto* rpcFields = maybeRpcFields()) {
847+
} else if (maybeRpcFields()) {
845848
return INVALID_OPERATION;
846849
}
847850
return NO_ERROR;
@@ -879,6 +882,7 @@ status_t Parcel::hasFileDescriptorsInRange(size_t offset, size_t len, bool* resu
879882
}
880883
#else
881884
LOG_ALWAYS_FATAL("Binder kernel driver disabled at build time");
885+
(void)kernelFields;
882886
return INVALID_OPERATION;
883887
#endif // BINDER_WITH_KERNEL_IPC
884888
} else if (const auto* rpcFields = maybeRpcFields()) {
@@ -971,6 +975,7 @@ status_t Parcel::writeInterfaceToken(const char16_t* str, size_t len) {
971975
writeInt32(kHeader);
972976
#else // BINDER_WITH_KERNEL_IPC
973977
LOG_ALWAYS_FATAL("Binder kernel driver disabled at build time");
978+
(void)kernelFields;
974979
return INVALID_OPERATION;
975980
#endif // BINDER_WITH_KERNEL_IPC
976981
}
@@ -1061,6 +1066,7 @@ bool Parcel::enforceInterface(const char16_t* interface,
10611066
#else // BINDER_WITH_KERNEL_IPC
10621067
LOG_ALWAYS_FATAL("Binder kernel driver disabled at build time");
10631068
(void)threadState;
1069+
(void)kernelFields;
10641070
return false;
10651071
#endif // BINDER_WITH_KERNEL_IPC
10661072
}
@@ -2688,6 +2694,7 @@ void Parcel::closeFileDescriptors(size_t newObjectsSize) {
26882694
#else // BINDER_WITH_KERNEL_IPC
26892695
(void)newObjectsSize;
26902696
LOG_ALWAYS_FATAL("Binder kernel driver disabled at build time");
2697+
(void)kernelFields;
26912698
#endif // BINDER_WITH_KERNEL_IPC
26922699
} else if (auto* rpcFields = maybeRpcFields()) {
26932700
rpcFields->mFds.reset();

0 commit comments

Comments
 (0)