diff options
-rw-r--r-- | libs/binder/Android.bp | 1 | ||||
-rw-r--r-- | libs/binder/IActivityManager.cpp | 2 | ||||
-rw-r--r-- | libs/binder/IAppOpsCallback.cpp | 2 | ||||
-rw-r--r-- | libs/binder/IAppOpsService.cpp | 2 | ||||
-rw-r--r-- | libs/binder/IBatteryStats.cpp | 2 | ||||
-rw-r--r-- | libs/binder/IMediaResourceMonitor.cpp | 2 | ||||
-rw-r--r-- | libs/binder/IMemory.cpp | 4 | ||||
-rw-r--r-- | libs/binder/IPermissionController.cpp | 2 | ||||
-rw-r--r-- | libs/binder/IProcessInfoService.cpp | 2 | ||||
-rw-r--r-- | libs/binder/IResultReceiver.cpp | 2 | ||||
-rw-r--r-- | libs/binder/IShellCallback.cpp | 2 | ||||
-rw-r--r-- | libs/binder/IUidObserver.cpp | 2 | ||||
-rw-r--r-- | libs/binder/PermissionCache.cpp | 2 | ||||
-rw-r--r-- | libs/binder/ProcessInfoService.cpp | 2 | ||||
-rw-r--r-- | libs/binder/Static.cpp | 4 | ||||
-rw-r--r-- | libs/binder/include/binder/BpBinder.h | 2 | ||||
-rw-r--r-- | libs/binder/include/binder/IShellCallback.h | 2 | ||||
-rw-r--r-- | libs/binder/include/binder/IpPrefix.h | 4 | ||||
-rw-r--r-- | libs/binder/include/binder/ParcelableHolder.h | 4 | ||||
-rw-r--r-- | libs/binder/tests/binderSafeInterfaceTest.cpp | 4 |
20 files changed, 25 insertions, 24 deletions
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp index 015954d230..90feedd2f2 100644 --- a/libs/binder/Android.bp +++ b/libs/binder/Android.bp @@ -145,6 +145,7 @@ cc_library { cflags: [ "-Wall", "-Wextra", + "-Wextra-semi", "-Werror", "-Wzero-as-null-pointer-constant", "-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION", diff --git a/libs/binder/IActivityManager.cpp b/libs/binder/IActivityManager.cpp index cf9bb46b21..08169f5538 100644 --- a/libs/binder/IActivityManager.cpp +++ b/libs/binder/IActivityManager.cpp @@ -135,6 +135,6 @@ public: // ------------------------------------------------------------------------------------ -IMPLEMENT_META_INTERFACE(ActivityManager, "android.app.IActivityManager"); +IMPLEMENT_META_INTERFACE(ActivityManager, "android.app.IActivityManager") } // namespace android diff --git a/libs/binder/IAppOpsCallback.cpp b/libs/binder/IAppOpsCallback.cpp index b9eb281870..2b3f462ab8 100644 --- a/libs/binder/IAppOpsCallback.cpp +++ b/libs/binder/IAppOpsCallback.cpp @@ -43,7 +43,7 @@ public: } }; -IMPLEMENT_META_INTERFACE(AppOpsCallback, "com.android.internal.app.IAppOpsCallback"); +IMPLEMENT_META_INTERFACE(AppOpsCallback, "com.android.internal.app.IAppOpsCallback") // ---------------------------------------------------------------------- diff --git a/libs/binder/IAppOpsService.cpp b/libs/binder/IAppOpsService.cpp index ee0cd6206e..18979697f8 100644 --- a/libs/binder/IAppOpsService.cpp +++ b/libs/binder/IAppOpsService.cpp @@ -162,7 +162,7 @@ public: } }; -IMPLEMENT_META_INTERFACE(AppOpsService, "com.android.internal.app.IAppOpsService"); +IMPLEMENT_META_INTERFACE(AppOpsService, "com.android.internal.app.IAppOpsService") // ---------------------------------------------------------------------- diff --git a/libs/binder/IBatteryStats.cpp b/libs/binder/IBatteryStats.cpp index a47dbaccfe..d0085dfa45 100644 --- a/libs/binder/IBatteryStats.cpp +++ b/libs/binder/IBatteryStats.cpp @@ -130,7 +130,7 @@ public: }; -IMPLEMENT_META_INTERFACE(BatteryStats, "com.android.internal.app.IBatteryStats"); +IMPLEMENT_META_INTERFACE(BatteryStats, "com.android.internal.app.IBatteryStats") // ---------------------------------------------------------------------- diff --git a/libs/binder/IMediaResourceMonitor.cpp b/libs/binder/IMediaResourceMonitor.cpp index 5f3d670b62..f5fa817b5e 100644 --- a/libs/binder/IMediaResourceMonitor.cpp +++ b/libs/binder/IMediaResourceMonitor.cpp @@ -38,7 +38,7 @@ public: } }; -IMPLEMENT_META_INTERFACE(MediaResourceMonitor, "android.media.IMediaResourceMonitor"); +IMPLEMENT_META_INTERFACE(MediaResourceMonitor, "android.media.IMediaResourceMonitor") // ---------------------------------------------------------------------- diff --git a/libs/binder/IMemory.cpp b/libs/binder/IMemory.cpp index d8b44f957d..cca8f81e45 100644 --- a/libs/binder/IMemory.cpp +++ b/libs/binder/IMemory.cpp @@ -223,7 +223,7 @@ sp<IMemoryHeap> BpMemory::getMemory(ssize_t* offset, size_t* size) const // --------------------------------------------------------------------------- -IMPLEMENT_META_INTERFACE(Memory, "android.utils.IMemory"); +IMPLEMENT_META_INTERFACE(Memory, "android.utils.IMemory") BnMemory::BnMemory() { } @@ -388,7 +388,7 @@ off_t BpMemoryHeap::getOffset() const { // --------------------------------------------------------------------------- -IMPLEMENT_META_INTERFACE(MemoryHeap, "android.utils.IMemoryHeap"); +IMPLEMENT_META_INTERFACE(MemoryHeap, "android.utils.IMemoryHeap") BnMemoryHeap::BnMemoryHeap() { } diff --git a/libs/binder/IPermissionController.cpp b/libs/binder/IPermissionController.cpp index d9bf3cc7b6..f94f413d8b 100644 --- a/libs/binder/IPermissionController.cpp +++ b/libs/binder/IPermissionController.cpp @@ -103,7 +103,7 @@ public: } }; -IMPLEMENT_META_INTERFACE(PermissionController, "android.os.IPermissionController"); +IMPLEMENT_META_INTERFACE(PermissionController, "android.os.IPermissionController") // ---------------------------------------------------------------------- diff --git a/libs/binder/IProcessInfoService.cpp b/libs/binder/IProcessInfoService.cpp index a38a27ad39..570edb9eb7 100644 --- a/libs/binder/IProcessInfoService.cpp +++ b/libs/binder/IProcessInfoService.cpp @@ -84,7 +84,7 @@ public: } }; -IMPLEMENT_META_INTERFACE(ProcessInfoService, "android.os.IProcessInfoService"); +IMPLEMENT_META_INTERFACE(ProcessInfoService, "android.os.IProcessInfoService") // ---------------------------------------------------------------------- diff --git a/libs/binder/IResultReceiver.cpp b/libs/binder/IResultReceiver.cpp index 556288c5dd..cd92217f84 100644 --- a/libs/binder/IResultReceiver.cpp +++ b/libs/binder/IResultReceiver.cpp @@ -42,7 +42,7 @@ public: } }; -IMPLEMENT_META_INTERFACE(ResultReceiver, "com.android.internal.os.IResultReceiver"); +IMPLEMENT_META_INTERFACE(ResultReceiver, "com.android.internal.os.IResultReceiver") // ---------------------------------------------------------------------- diff --git a/libs/binder/IShellCallback.cpp b/libs/binder/IShellCallback.cpp index a3e2b67bc6..86dd5c4f4b 100644 --- a/libs/binder/IShellCallback.cpp +++ b/libs/binder/IShellCallback.cpp @@ -52,7 +52,7 @@ public: } }; -IMPLEMENT_META_INTERFACE(ShellCallback, "com.android.internal.os.IShellCallback"); +IMPLEMENT_META_INTERFACE(ShellCallback, "com.android.internal.os.IShellCallback") // ---------------------------------------------------------------------- diff --git a/libs/binder/IUidObserver.cpp b/libs/binder/IUidObserver.cpp index 4714234291..a1b08db50c 100644 --- a/libs/binder/IUidObserver.cpp +++ b/libs/binder/IUidObserver.cpp @@ -71,7 +71,7 @@ public: // ---------------------------------------------------------------------- -IMPLEMENT_META_INTERFACE(UidObserver, "android.app.IUidObserver"); +IMPLEMENT_META_INTERFACE(UidObserver, "android.app.IUidObserver") // ---------------------------------------------------------------------- diff --git a/libs/binder/PermissionCache.cpp b/libs/binder/PermissionCache.cpp index 75a6d22969..6eae5efc29 100644 --- a/libs/binder/PermissionCache.cpp +++ b/libs/binder/PermissionCache.cpp @@ -27,7 +27,7 @@ namespace android { // ---------------------------------------------------------------------------- -ANDROID_SINGLETON_STATIC_INSTANCE(PermissionCache) ; +ANDROID_SINGLETON_STATIC_INSTANCE(PermissionCache) // ---------------------------------------------------------------------------- diff --git a/libs/binder/ProcessInfoService.cpp b/libs/binder/ProcessInfoService.cpp index 00d6eefabe..f75141e5da 100644 --- a/libs/binder/ProcessInfoService.cpp +++ b/libs/binder/ProcessInfoService.cpp @@ -99,6 +99,6 @@ void ProcessInfoService::updateBinderLocked() { } } -ANDROID_SINGLETON_STATIC_INSTANCE(ProcessInfoService); +ANDROID_SINGLETON_STATIC_INSTANCE(ProcessInfoService) } // namespace android diff --git a/libs/binder/Static.cpp b/libs/binder/Static.cpp index db0f1c7c3f..565f2e25f3 100644 --- a/libs/binder/Static.cpp +++ b/libs/binder/Static.cpp @@ -33,7 +33,7 @@ class LogTextOutput : public BufferedTextOutput { public: LogTextOutput() : BufferedTextOutput(MULTITHREADED) { } - virtual ~LogTextOutput() { }; + virtual ~LogTextOutput() { } protected: virtual status_t writeLines(const struct iovec& vec, size_t N) @@ -49,7 +49,7 @@ class FdTextOutput : public BufferedTextOutput { public: explicit FdTextOutput(int fd) : BufferedTextOutput(MULTITHREADED), mFD(fd) { } - virtual ~FdTextOutput() { }; + virtual ~FdTextOutput() { } protected: virtual status_t writeLines(const struct iovec& vec, size_t N) diff --git a/libs/binder/include/binder/BpBinder.h b/libs/binder/include/binder/BpBinder.h index a0e28d2543..273531526f 100644 --- a/libs/binder/include/binder/BpBinder.h +++ b/libs/binder/include/binder/BpBinder.h @@ -28,7 +28,7 @@ namespace android { namespace internal { class Stability; -}; +} using binder_proxy_limit_callback = void(*)(int); diff --git a/libs/binder/include/binder/IShellCallback.h b/libs/binder/include/binder/IShellCallback.h index 17e34db284..6d3fe4a13e 100644 --- a/libs/binder/include/binder/IShellCallback.h +++ b/libs/binder/include/binder/IShellCallback.h @@ -25,7 +25,7 @@ namespace android { class IShellCallback : public IInterface { public: - DECLARE_META_INTERFACE(ShellCallback); + DECLARE_META_INTERFACE(ShellCallback) virtual int openFile(const String16& path, const String16& seLinuxContext, const String16& mode) = 0; diff --git a/libs/binder/include/binder/IpPrefix.h b/libs/binder/include/binder/IpPrefix.h index c1cd3c22ba..a8faa3fded 100644 --- a/libs/binder/include/binder/IpPrefix.h +++ b/libs/binder/include/binder/IpPrefix.h @@ -73,8 +73,8 @@ public: private: union InternalUnion { InternalUnion() = default; - explicit InternalUnion(const struct in6_addr &addr):mIn6Addr(addr) { }; - explicit InternalUnion(const struct in_addr &addr):mInAddr(addr) { }; + explicit InternalUnion(const struct in6_addr &addr):mIn6Addr(addr) { } + explicit InternalUnion(const struct in_addr &addr):mInAddr(addr) { } struct in6_addr mIn6Addr; struct in_addr mInAddr; } mUnion; diff --git a/libs/binder/include/binder/ParcelableHolder.h b/libs/binder/include/binder/ParcelableHolder.h index 4ea3dd3399..ce5027eb96 100644 --- a/libs/binder/include/binder/ParcelableHolder.h +++ b/libs/binder/include/binder/ParcelableHolder.h @@ -30,7 +30,7 @@ namespace os { class ParcelableHolder : public android::Parcelable { public: ParcelableHolder() = delete; - explicit ParcelableHolder(Stability stability) : mStability(stability){}; + explicit ParcelableHolder(Stability stability) : mStability(stability){} virtual ~ParcelableHolder() = default; ParcelableHolder(const ParcelableHolder& other) { mParcelable = other.mParcelable; @@ -40,7 +40,7 @@ public: mParcelPtr->appendFrom(other.mParcelPtr.get(), 0, other.mParcelPtr->dataSize()); } mStability = other.mStability; - }; + } status_t writeToParcel(Parcel* parcel) const override; status_t readFromParcel(const Parcel* parcel) override; diff --git a/libs/binder/tests/binderSafeInterfaceTest.cpp b/libs/binder/tests/binderSafeInterfaceTest.cpp index 09f58cc833..2f9d85efcf 100644 --- a/libs/binder/tests/binderSafeInterfaceTest.cpp +++ b/libs/binder/tests/binderSafeInterfaceTest.cpp @@ -184,7 +184,7 @@ private: #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wexit-time-destructors" -IMPLEMENT_META_INTERFACE(Callback, "android.gfx.tests.ICallback"); +IMPLEMENT_META_INTERFACE(Callback, "android.gfx.tests.ICallback") #pragma clang diagnostic pop class BnCallback : public SafeBnInterface<ICallback> { @@ -373,7 +373,7 @@ private: #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wexit-time-destructors" -IMPLEMENT_META_INTERFACE(SafeInterfaceTest, "android.gfx.tests.ISafeInterfaceTest"); +IMPLEMENT_META_INTERFACE(SafeInterfaceTest, "android.gfx.tests.ISafeInterfaceTest") static sp<IBinder::DeathRecipient> getDeathRecipient() { static sp<IBinder::DeathRecipient> recipient = new ExitOnDeath; |