From 384328e986dd3684b00fd5d6bfd04a3de77a2c2e Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Fri, 13 Nov 2020 17:16:48 +0900 Subject: binder: fix performance-unnecessary-value-param Bug: 162909698 Test: m libbinder Change-Id: I91afd69d482984138a52dda39bc68056d62a442e --- libs/binder/Android.bp | 1 - libs/binder/IPCThreadState.cpp | 2 +- libs/binder/include/binder/IPCThreadState.h | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp index d4cc907bde..f4060a292c 100644 --- a/libs/binder/Android.bp +++ b/libs/binder/Android.bp @@ -184,7 +184,6 @@ cc_library { "-google-default-arguments", "-google-explicit-constructor", "-google-runtime-int", - "-performance-unnecessary-value-param", ], } diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp index 28ce935be1..c5835c614a 100644 --- a/libs/binder/IPCThreadState.cpp +++ b/libs/binder/IPCThreadState.cpp @@ -1077,7 +1077,7 @@ status_t IPCThreadState::writeTransactionData(int32_t cmd, uint32_t binderFlags, sp the_context_object; -void IPCThreadState::setTheContextObject(sp obj) +void IPCThreadState::setTheContextObject(const sp& obj) { the_context_object = obj; } diff --git a/libs/binder/include/binder/IPCThreadState.h b/libs/binder/include/binder/IPCThreadState.h index 418ac353c9..4da8aa1dfe 100644 --- a/libs/binder/include/binder/IPCThreadState.h +++ b/libs/binder/include/binder/IPCThreadState.h @@ -146,7 +146,7 @@ public: void blockUntilThreadAvailable(); // Service manager registration - void setTheContextObject(sp obj); + void setTheContextObject(const sp& obj); // WARNING: DO NOT USE THIS API // -- cgit v1.2.3-59-g8ed1b From 70072fd16fb0c4a893bf69836a80f1a673f5286e Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Fri, 13 Nov 2020 17:19:14 +0900 Subject: binder: fix google-explicit-constructor Bug: 162909698 Test: m libbinder Change-Id: I77ac3f7783ee0fe675c5ab42610eda25c4d51378 --- libs/binder/Android.bp | 1 - libs/binder/IServiceManager.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp index f4060a292c..dfeefe983a 100644 --- a/libs/binder/Android.bp +++ b/libs/binder/Android.bp @@ -182,7 +182,6 @@ cc_library { "*", "-google-build-using-namespace", "-google-default-arguments", - "-google-explicit-constructor", "-google-runtime-int", ], } diff --git a/libs/binder/IServiceManager.cpp b/libs/binder/IServiceManager.cpp index 6d728dc6b1..35e642deb2 100644 --- a/libs/binder/IServiceManager.cpp +++ b/libs/binder/IServiceManager.cpp @@ -310,7 +310,7 @@ sp ServiceManagerShim::waitForService(const String16& name16) // Simple RAII object to ensure a function call immediately before going out of scope class Defer { public: - Defer(std::function&& f) : mF(std::move(f)) {} + explicit Defer(std::function&& f) : mF(std::move(f)) {} ~Defer() { mF(); } private: std::function mF; -- cgit v1.2.3-59-g8ed1b From ea2e23f84b91f3b76cd841c23af0c564ac3c7ca2 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Fri, 13 Nov 2020 17:26:33 +0900 Subject: binder: fix google-build-using-namespace Bug: 162909698 Test: m libbinder Change-Id: I821c42c32b38e38dbbca347f6a99bcc24898df7d --- libs/binder/Android.bp | 1 - libs/binder/PersistableBundle.cpp | 14 +++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp index dfeefe983a..e31add2a1f 100644 --- a/libs/binder/Android.bp +++ b/libs/binder/Android.bp @@ -180,7 +180,6 @@ cc_library { ], tidy_checks_as_errors: [ "*", - "-google-build-using-namespace", "-google-default-arguments", "-google-runtime-int", ], diff --git a/libs/binder/PersistableBundle.cpp b/libs/binder/PersistableBundle.cpp index 97a6c94635..c807cfe89a 100644 --- a/libs/binder/PersistableBundle.cpp +++ b/libs/binder/PersistableBundle.cpp @@ -34,10 +34,22 @@ using android::Parcel; using android::sp; using android::status_t; using android::UNEXPECTED_NULL; + +using android::binder::VAL_BOOLEAN; +using android::binder::VAL_INTEGER; +using android::binder::VAL_LONG; +using android::binder::VAL_DOUBLE; +using android::binder::VAL_STRING; +using android::binder::VAL_BOOLEANARRAY; +using android::binder::VAL_INTARRAY; +using android::binder::VAL_LONGARRAY; +using android::binder::VAL_DOUBLEARRAY; +using android::binder::VAL_STRINGARRAY; +using android::binder::VAL_PERSISTABLEBUNDLE; + using std::map; using std::set; using std::vector; -using namespace ::android::binder; enum { // Keep them in sync with BUNDLE_MAGIC* in frameworks/base/core/java/android/os/BaseBundle.java. -- cgit v1.2.3-59-g8ed1b From 276781add64288a00c2e3c4fc39a5f806a6e140f Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Fri, 13 Nov 2020 18:19:27 +0900 Subject: binder: fix google-default-arguments Bug: 162909698 Test: m libbinder Change-Id: I51839f56e9390614436d434b13969106835a68c9 --- libs/binder/Android.bp | 1 - libs/binder/IMediaResourceMonitor.cpp | 1 + libs/binder/IUidObserver.cpp | 1 + libs/binder/include/binder/IMediaResourceMonitor.h | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp index e31add2a1f..d02f22cc99 100644 --- a/libs/binder/Android.bp +++ b/libs/binder/Android.bp @@ -180,7 +180,6 @@ cc_library { ], tidy_checks_as_errors: [ "*", - "-google-default-arguments", "-google-runtime-int", ], } diff --git a/libs/binder/IMediaResourceMonitor.cpp b/libs/binder/IMediaResourceMonitor.cpp index 4198e49259..5f3d670b62 100644 --- a/libs/binder/IMediaResourceMonitor.cpp +++ b/libs/binder/IMediaResourceMonitor.cpp @@ -42,6 +42,7 @@ IMPLEMENT_META_INTERFACE(MediaResourceMonitor, "android.media.IMediaResourceMoni // ---------------------------------------------------------------------- +// NOLINTNEXTLINE(google-default-arguments) status_t BnMediaResourceMonitor::onTransact( uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags) { switch(code) { diff --git a/libs/binder/IUidObserver.cpp b/libs/binder/IUidObserver.cpp index b21af960d2..4714234291 100644 --- a/libs/binder/IUidObserver.cpp +++ b/libs/binder/IUidObserver.cpp @@ -75,6 +75,7 @@ IMPLEMENT_META_INTERFACE(UidObserver, "android.app.IUidObserver"); // ---------------------------------------------------------------------- +// NOLINTNEXTLINE(google-default-arguments) status_t BnUidObserver::onTransact( uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags) { diff --git a/libs/binder/include/binder/IMediaResourceMonitor.h b/libs/binder/include/binder/IMediaResourceMonitor.h index ac4b4cad5e..f92d557932 100644 --- a/libs/binder/include/binder/IMediaResourceMonitor.h +++ b/libs/binder/include/binder/IMediaResourceMonitor.h @@ -45,6 +45,7 @@ public: class BnMediaResourceMonitor : public BnInterface { public: + // NOLINTNEXTLINE(google-default-arguments) virtual status_t onTransact(uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags = 0); }; -- cgit v1.2.3-59-g8ed1b