diff options
author | 2018-10-29 23:01:57 +0900 | |
---|---|---|
committer | 2018-10-29 23:01:57 +0900 | |
commit | b86c866234b679fbeac4eec9a1d5e4418cac1997 (patch) | |
tree | 1c36a364f3806c415beaa12575031716b6a77cc6 | |
parent | 8bae3798cb56789e8297ba0b43979014d00b05ba (diff) |
Suppress lint warnings on google-default-arguments
The lint rule google-default-arguments ensures that virtual or override
methods do not have default arguments, because different default values
across the hierarchy chain (e.g. Base::foo(int a=0) v.s.
Derived::foo(int a=10)) can cause confusions.
However, since the uses of the default arguments in libbinder don't lead
to such problem, suppress the warnings.
Test: WITH_TIDY=true WITH_TIDY_CHECKS=google-default-arguments m
libbinder does not show any warning about google-default-arguments
Change-Id: I90f6d05a9dc3232d0c63563df18a582432b83574
21 files changed, 41 insertions, 1 deletions
diff --git a/libs/binder/Binder.cpp b/libs/binder/Binder.cpp index 1bd7c4fb42..f6cc3afc97 100644 --- a/libs/binder/Binder.cpp +++ b/libs/binder/Binder.cpp @@ -115,6 +115,7 @@ const String16& BBinder::getInterfaceDescriptor() const return sEmptyDescriptor; } +// NOLINTNEXTLINE(google-default-arguments) status_t BBinder::transact( uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags) { @@ -137,6 +138,7 @@ status_t BBinder::transact( return err; } +// NOLINTNEXTLINE(google-default-arguments) status_t BBinder::linkToDeath( const sp<DeathRecipient>& /*recipient*/, void* /*cookie*/, uint32_t /*flags*/) @@ -144,6 +146,7 @@ status_t BBinder::linkToDeath( return INVALID_OPERATION; } +// NOLINTNEXTLINE(google-default-arguments) status_t BBinder::unlinkToDeath( const wp<DeathRecipient>& /*recipient*/, void* /*cookie*/, uint32_t /*flags*/, wp<DeathRecipient>* /*outRecipient*/) @@ -208,6 +211,7 @@ BBinder::~BBinder() } +// NOLINTNEXTLINE(google-default-arguments) status_t BBinder::onTransact( uint32_t code, const Parcel& data, Parcel* reply, uint32_t /*flags*/) { diff --git a/libs/binder/BpBinder.cpp b/libs/binder/BpBinder.cpp index 734212626a..ec170f7a65 100644 --- a/libs/binder/BpBinder.cpp +++ b/libs/binder/BpBinder.cpp @@ -206,6 +206,7 @@ status_t BpBinder::dump(int fd, const Vector<String16>& args) return err; } +// NOLINTNEXTLINE(google-default-arguments) status_t BpBinder::transact( uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags) { @@ -220,6 +221,7 @@ status_t BpBinder::transact( return DEAD_OBJECT; } +// NOLINTNEXTLINE(google-default-arguments) status_t BpBinder::linkToDeath( const sp<DeathRecipient>& recipient, void* cookie, uint32_t flags) { @@ -254,6 +256,7 @@ status_t BpBinder::linkToDeath( return DEAD_OBJECT; } +// NOLINTNEXTLINE(google-default-arguments) status_t BpBinder::unlinkToDeath( const wp<DeathRecipient>& recipient, void* cookie, uint32_t flags, wp<DeathRecipient>* outRecipient) diff --git a/libs/binder/IAppOpsCallback.cpp b/libs/binder/IAppOpsCallback.cpp index f9ec593f77..2f4dbeea18 100644 --- a/libs/binder/IAppOpsCallback.cpp +++ b/libs/binder/IAppOpsCallback.cpp @@ -49,6 +49,7 @@ IMPLEMENT_META_INTERFACE(AppOpsCallback, "com.android.internal.app.IAppOpsCallba // ---------------------------------------------------------------------- +// NOLINTNEXTLINE(google-default-arguments) status_t BnAppOpsCallback::onTransact( uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags) { diff --git a/libs/binder/IAppOpsService.cpp b/libs/binder/IAppOpsService.cpp index 068664b418..fb0d521cac 100644 --- a/libs/binder/IAppOpsService.cpp +++ b/libs/binder/IAppOpsService.cpp @@ -129,6 +129,7 @@ IMPLEMENT_META_INTERFACE(AppOpsService, "com.android.internal.app.IAppOpsService // ---------------------------------------------------------------------- +// NOLINTNEXTLINE(google-default-arguments) status_t BnAppOpsService::onTransact( uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags) { diff --git a/libs/binder/IBatteryStats.cpp b/libs/binder/IBatteryStats.cpp index ad1e69faeb..b307e3e7b5 100644 --- a/libs/binder/IBatteryStats.cpp +++ b/libs/binder/IBatteryStats.cpp @@ -136,6 +136,7 @@ IMPLEMENT_META_INTERFACE(BatteryStats, "com.android.internal.app.IBatteryStats") // ---------------------------------------------------------------------- +// NOLINTNEXTLINE(google-default-arguments) status_t BnBatteryStats::onTransact( uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags) { diff --git a/libs/binder/IMemory.cpp b/libs/binder/IMemory.cpp index 507ce53b66..307bc28c0e 100644 --- a/libs/binder/IMemory.cpp +++ b/libs/binder/IMemory.cpp @@ -129,6 +129,7 @@ class BpMemory : public BpInterface<IMemory> public: explicit BpMemory(const sp<IBinder>& impl); virtual ~BpMemory(); + // NOLINTNEXTLINE(google-default-arguments) virtual sp<IMemoryHeap> getMemory(ssize_t* offset=nullptr, size_t* size=nullptr) const; private: @@ -180,6 +181,7 @@ BpMemory::~BpMemory() { } +// NOLINTNEXTLINE(google-default-arguments) sp<IMemoryHeap> BpMemory::getMemory(ssize_t* offset, size_t* size) const { if (mHeap == nullptr) { @@ -224,6 +226,7 @@ BnMemory::BnMemory() { BnMemory::~BnMemory() { } +// NOLINTNEXTLINE(google-default-arguments) status_t BnMemory::onTransact( uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags) { @@ -383,6 +386,7 @@ BnMemoryHeap::BnMemoryHeap() { BnMemoryHeap::~BnMemoryHeap() { } +// NOLINTNEXTLINE(google-default-arguments) status_t BnMemoryHeap::onTransact( uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags) { diff --git a/libs/binder/IPermissionController.cpp b/libs/binder/IPermissionController.cpp index 89ebc6c1aa..6b99150edf 100644 --- a/libs/binder/IPermissionController.cpp +++ b/libs/binder/IPermissionController.cpp @@ -109,6 +109,7 @@ IMPLEMENT_META_INTERFACE(PermissionController, "android.os.IPermissionController // ---------------------------------------------------------------------- +// NOLINTNEXTLINE(google-default-arguments) status_t BnPermissionController::onTransact( uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags) { diff --git a/libs/binder/IResultReceiver.cpp b/libs/binder/IResultReceiver.cpp index 14b5259536..159763d5bf 100644 --- a/libs/binder/IResultReceiver.cpp +++ b/libs/binder/IResultReceiver.cpp @@ -48,6 +48,7 @@ IMPLEMENT_META_INTERFACE(ResultReceiver, "com.android.internal.os.IResultReceive // ---------------------------------------------------------------------- +// NOLINTNEXTLINE(google-default-arguments) status_t BnResultReceiver::onTransact( uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags) { diff --git a/libs/binder/IShellCallback.cpp b/libs/binder/IShellCallback.cpp index dd4a65ee84..6c697decca 100644 --- a/libs/binder/IShellCallback.cpp +++ b/libs/binder/IShellCallback.cpp @@ -58,6 +58,7 @@ IMPLEMENT_META_INTERFACE(ShellCallback, "com.android.internal.os.IShellCallback" // ---------------------------------------------------------------------- +// NOLINTNEXTLINE(google-default-arguments) status_t BnShellCallback::onTransact( uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags) { diff --git a/libs/binder/include/binder/Binder.h b/libs/binder/include/binder/Binder.h index 0b60b4e5fd..c251468bdb 100644 --- a/libs/binder/include/binder/Binder.h +++ b/libs/binder/include/binder/Binder.h @@ -34,15 +34,18 @@ public: virtual status_t pingBinder(); virtual status_t dump(int fd, const Vector<String16>& args); + // NOLINTNEXTLINE(google-default-arguments) virtual status_t transact( uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags = 0); + // NOLINTNEXTLINE(google-default-arguments) virtual status_t linkToDeath(const sp<DeathRecipient>& recipient, void* cookie = nullptr, uint32_t flags = 0); + // NOLINTNEXTLINE(google-default-arguments) virtual status_t unlinkToDeath( const wp<DeathRecipient>& recipient, void* cookie = nullptr, uint32_t flags = 0, @@ -60,6 +63,7 @@ public: protected: virtual ~BBinder(); + // NOLINTNEXTLINE(google-default-arguments) virtual status_t onTransact( uint32_t code, const Parcel& data, Parcel* reply, diff --git a/libs/binder/include/binder/BpBinder.h b/libs/binder/include/binder/BpBinder.h index c4c8ba3e74..1d4f88113a 100644 --- a/libs/binder/include/binder/BpBinder.h +++ b/libs/binder/include/binder/BpBinder.h @@ -41,14 +41,18 @@ public: virtual status_t pingBinder(); virtual status_t dump(int fd, const Vector<String16>& args); + // NOLINTNEXTLINE(google-default-arguments) virtual status_t transact( uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags = 0); + // NOLINTNEXTLINE(google-default-arguments) virtual status_t linkToDeath(const sp<DeathRecipient>& recipient, void* cookie = nullptr, uint32_t flags = 0); + + // NOLINTNEXTLINE(google-default-arguments) virtual status_t unlinkToDeath( const wp<DeathRecipient>& recipient, void* cookie = nullptr, uint32_t flags = 0, diff --git a/libs/binder/include/binder/IAppOpsCallback.h b/libs/binder/include/binder/IAppOpsCallback.h index e5b12a9720..b500219e37 100644 --- a/libs/binder/include/binder/IAppOpsCallback.h +++ b/libs/binder/include/binder/IAppOpsCallback.h @@ -43,6 +43,7 @@ public: class BnAppOpsCallback : public BnInterface<IAppOpsCallback> { public: + // NOLINTNEXTLINE(google-default-arguments) virtual status_t onTransact( uint32_t code, const Parcel& data, Parcel* reply, diff --git a/libs/binder/include/binder/IAppOpsService.h b/libs/binder/include/binder/IAppOpsService.h index f0c5e1743d..78078513ff 100644 --- a/libs/binder/include/binder/IAppOpsService.h +++ b/libs/binder/include/binder/IAppOpsService.h @@ -67,6 +67,7 @@ public: class BnAppOpsService : public BnInterface<IAppOpsService> { public: + // NOLINTNEXTLINE(google-default-arguments) virtual status_t onTransact( uint32_t code, const Parcel& data, Parcel* reply, diff --git a/libs/binder/include/binder/IBatteryStats.h b/libs/binder/include/binder/IBatteryStats.h index 59e806c177..48da865702 100644 --- a/libs/binder/include/binder/IBatteryStats.h +++ b/libs/binder/include/binder/IBatteryStats.h @@ -68,6 +68,7 @@ public: class BnBatteryStats : public BnInterface<IBatteryStats> { public: + // NOLINTNEXTLINE(google-default-arguments) virtual status_t onTransact( uint32_t code, const Parcel& data, Parcel* reply, diff --git a/libs/binder/include/binder/IBinder.h b/libs/binder/include/binder/IBinder.h index 3f0dad0f25..14edcbe72a 100644 --- a/libs/binder/include/binder/IBinder.h +++ b/libs/binder/include/binder/IBinder.h @@ -86,6 +86,7 @@ public: Vector<String16>& args, const sp<IShellCallback>& callback, const sp<IResultReceiver>& resultReceiver); + // NOLINTNEXTLINE(google-default-arguments) virtual status_t transact( uint32_t code, const Parcel& data, Parcel* reply, @@ -131,6 +132,7 @@ public: * (Nor should you need to, as there is nothing useful you can * directly do with it now that it has passed on.) */ + // NOLINTNEXTLINE(google-default-arguments) virtual status_t linkToDeath(const sp<DeathRecipient>& recipient, void* cookie = nullptr, uint32_t flags = 0) = 0; @@ -142,6 +144,7 @@ public: * supply a NULL @a recipient, and the recipient previously * added with that cookie will be unlinked. */ + // NOLINTNEXTLINE(google-default-arguments) virtual status_t unlinkToDeath( const wp<DeathRecipient>& recipient, void* cookie = nullptr, uint32_t flags = 0, diff --git a/libs/binder/include/binder/IMemory.h b/libs/binder/include/binder/IMemory.h index 3099bf5fb8..db9f53a797 100644 --- a/libs/binder/include/binder/IMemory.h +++ b/libs/binder/include/binder/IMemory.h @@ -54,7 +54,8 @@ public: class BnMemoryHeap : public BnInterface<IMemoryHeap> { public: - virtual status_t onTransact( + // NOLINTNEXTLINE(google-default-arguments) + virtual status_t onTransact( uint32_t code, const Parcel& data, Parcel* reply, @@ -72,6 +73,7 @@ class IMemory : public IInterface public: DECLARE_META_INTERFACE(Memory) + // NOLINTNEXTLINE(google-default-arguments) virtual sp<IMemoryHeap> getMemory(ssize_t* offset=nullptr, size_t* size=nullptr) const = 0; // helpers @@ -84,6 +86,7 @@ public: class BnMemory : public BnInterface<IMemory> { public: + // NOLINTNEXTLINE(google-default-arguments) virtual status_t onTransact( uint32_t code, const Parcel& data, diff --git a/libs/binder/include/binder/IPermissionController.h b/libs/binder/include/binder/IPermissionController.h index 3ec459fc32..26a1b23a9a 100644 --- a/libs/binder/include/binder/IPermissionController.h +++ b/libs/binder/include/binder/IPermissionController.h @@ -56,6 +56,7 @@ public: class BnPermissionController : public BnInterface<IPermissionController> { public: + // NOLINTNEXTLINE(google-default-arguments) virtual status_t onTransact( uint32_t code, const Parcel& data, Parcel* reply, diff --git a/libs/binder/include/binder/IResultReceiver.h b/libs/binder/include/binder/IResultReceiver.h index e494fba0b8..00b3d8954c 100644 --- a/libs/binder/include/binder/IResultReceiver.h +++ b/libs/binder/include/binder/IResultReceiver.h @@ -41,6 +41,7 @@ public: class BnResultReceiver : public BnInterface<IResultReceiver> { public: + // NOLINTNEXTLINE(google-default-arguments) virtual status_t onTransact( uint32_t code, const Parcel& data, Parcel* reply, diff --git a/libs/binder/include/binder/IServiceManager.h b/libs/binder/include/binder/IServiceManager.h index a998529cd8..e5d8ea67de 100644 --- a/libs/binder/include/binder/IServiceManager.h +++ b/libs/binder/include/binder/IServiceManager.h @@ -61,6 +61,7 @@ public: /** * Register a service. */ + // NOLINTNEXTLINE(google-default-arguments) virtual status_t addService(const String16& name, const sp<IBinder>& service, bool allowIsolated = false, int dumpsysFlags = DUMP_FLAG_PRIORITY_DEFAULT) = 0; @@ -68,6 +69,7 @@ public: /** * Return list of all existing services. */ + // NOLINTNEXTLINE(google-default-arguments) virtual Vector<String16> listServices(int dumpsysFlags = DUMP_FLAG_PRIORITY_ALL) = 0; enum { diff --git a/libs/binder/include/binder/IShellCallback.h b/libs/binder/include/binder/IShellCallback.h index b47e995183..67156787d3 100644 --- a/libs/binder/include/binder/IShellCallback.h +++ b/libs/binder/include/binder/IShellCallback.h @@ -42,6 +42,7 @@ public: class BnShellCallback : public BnInterface<IShellCallback> { public: + // NOLINTNEXTLINE(google-default-arguments) virtual status_t onTransact( uint32_t code, const Parcel& data, Parcel* reply, diff --git a/libs/binder/include/binder/IUidObserver.h b/libs/binder/include/binder/IUidObserver.h index d81789e399..9937ad6a29 100644 --- a/libs/binder/include/binder/IUidObserver.h +++ b/libs/binder/include/binder/IUidObserver.h @@ -47,6 +47,7 @@ public: class BnUidObserver : public BnInterface<IUidObserver> { public: + // NOLINTNEXTLINE(google-default-arguments) virtual status_t onTransact(uint32_t code, const Parcel& data, Parcel* reply, |