diff options
35 files changed, 36 insertions, 151 deletions
diff --git a/libs/binder/include/binder/ActivityManager.h b/libs/binder/include/binder/ActivityManager.h index 9108e31758..b90dc862ce 100644 --- a/libs/binder/include/binder/ActivityManager.h +++ b/libs/binder/include/binder/ActivityManager.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef ANDROID_ACTIVITY_MANAGER_H -#define ANDROID_ACTIVITY_MANAGER_H +#pragma once #ifndef __ANDROID_VNDK__ @@ -94,5 +93,3 @@ private: #else // __ANDROID_VNDK__ #error "This header is not visible to vendors" #endif // __ANDROID_VNDK__ - -#endif // ANDROID_ACTIVITY_MANAGER_H diff --git a/libs/binder/include/binder/AppOpsManager.h b/libs/binder/include/binder/AppOpsManager.h index 6d04f13211..18a8a98068 100644 --- a/libs/binder/include/binder/AppOpsManager.h +++ b/libs/binder/include/binder/AppOpsManager.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef ANDROID_APP_OPS_MANAGER_H -#define ANDROID_APP_OPS_MANAGER_H +#pragma once #include <binder/IAppOpsService.h> @@ -175,5 +174,3 @@ private: } // namespace android // --------------------------------------------------------------------------- - -#endif // ANDROID_APP_OPS_MANAGER_H diff --git a/libs/binder/include/binder/Binder.h b/libs/binder/include/binder/Binder.h index f3fea163cd..d6da39783c 100644 --- a/libs/binder/include/binder/Binder.h +++ b/libs/binder/include/binder/Binder.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef ANDROID_BINDER_H -#define ANDROID_BINDER_H +#pragma once #include <atomic> #include <stdint.h> @@ -142,5 +141,3 @@ private: } // namespace android // --------------------------------------------------------------------------- - -#endif // ANDROID_BINDER_H diff --git a/libs/binder/include/binder/BinderService.h b/libs/binder/include/binder/BinderService.h index c17ae6f5fe..5776f3c91f 100644 --- a/libs/binder/include/binder/BinderService.h +++ b/libs/binder/include/binder/BinderService.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef ANDROID_BINDER_SERVICE_H -#define ANDROID_BINDER_SERVICE_H +#pragma once #include <stdint.h> @@ -64,4 +63,3 @@ private: } // namespace android // --------------------------------------------------------------------------- -#endif // ANDROID_BINDER_SERVICE_H diff --git a/libs/binder/include/binder/BpBinder.h b/libs/binder/include/binder/BpBinder.h index 378a91115e..64d0657edf 100644 --- a/libs/binder/include/binder/BpBinder.h +++ b/libs/binder/include/binder/BpBinder.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef ANDROID_BPBINDER_H -#define ANDROID_BPBINDER_H +#pragma once #include <binder/IBinder.h> #include <utils/KeyedVector.h> @@ -153,5 +152,3 @@ private: } // namespace android // --------------------------------------------------------------------------- - -#endif // ANDROID_BPBINDER_H diff --git a/libs/binder/include/binder/Debug.h b/libs/binder/include/binder/Debug.h index 324e5c1c81..ac71e003c4 100644 --- a/libs/binder/include/binder/Debug.h +++ b/libs/binder/include/binder/Debug.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef ANDROID_BINDER_DEBUG_H -#define ANDROID_BINDER_DEBUG_H +#pragma once #include <stdint.h> #include <sys/cdefs.h> @@ -45,5 +44,3 @@ __END_DECLS // --------------------------------------------------------------------------- } // namespace android - -#endif // ANDROID_BINDER_DEBUG_H diff --git a/libs/binder/include/binder/Enums.h b/libs/binder/include/binder/Enums.h index aec6f7038d..c6803bd7c8 100644 --- a/libs/binder/include/binder/Enums.h +++ b/libs/binder/include/binder/Enums.h @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #pragma once #include <iterator> @@ -38,4 +39,4 @@ struct enum_range { constexpr auto end() const { return std::end(internal::enum_values<EnumType>); } }; -} // namespace android
\ No newline at end of file +} // namespace android diff --git a/libs/binder/include/binder/IActivityManager.h b/libs/binder/include/binder/IActivityManager.h index e0248f6624..fde56a01a4 100644 --- a/libs/binder/include/binder/IActivityManager.h +++ b/libs/binder/include/binder/IActivityManager.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef ANDROID_IACTIVITY_MANAGER_H -#define ANDROID_IACTIVITY_MANAGER_H +#pragma once #ifndef __ANDROID_VNDK__ @@ -56,5 +55,3 @@ public: #else // __ANDROID_VNDK__ #error "This header is not visible to vendors" #endif // __ANDROID_VNDK__ - -#endif // ANDROID_IACTIVITY_MANAGER_H diff --git a/libs/binder/include/binder/IAppOpsCallback.h b/libs/binder/include/binder/IAppOpsCallback.h index 76642606fc..eb76f57bf8 100644 --- a/libs/binder/include/binder/IAppOpsCallback.h +++ b/libs/binder/include/binder/IAppOpsCallback.h @@ -14,9 +14,7 @@ * limitations under the License. */ -// -#ifndef ANDROID_IAPP_OPS_CALLBACK_H -#define ANDROID_IAPP_OPS_CALLBACK_H +#pragma once #ifndef __ANDROID_VNDK__ @@ -57,6 +55,3 @@ public: #else // __ANDROID_VNDK__ #error "This header is not visible to vendors" #endif // __ANDROID_VNDK__ - -#endif // ANDROID_IAPP_OPS_CALLBACK_H - diff --git a/libs/binder/include/binder/IAppOpsService.h b/libs/binder/include/binder/IAppOpsService.h index a4a20c8b10..b0719d4ebc 100644 --- a/libs/binder/include/binder/IAppOpsService.h +++ b/libs/binder/include/binder/IAppOpsService.h @@ -14,9 +14,7 @@ * limitations under the License. */ -// -#ifndef ANDROID_IAPP_OPS_SERVICE_H -#define ANDROID_IAPP_OPS_SERVICE_H +#pragma once #include <binder/IAppOpsCallback.h> #include <binder/IInterface.h> @@ -89,5 +87,3 @@ public: // ---------------------------------------------------------------------- } // namespace android - -#endif // ANDROID_IAPP_OPS_SERVICE_H diff --git a/libs/binder/include/binder/IBatteryStats.h b/libs/binder/include/binder/IBatteryStats.h index b786f89f74..6defc7fb0b 100644 --- a/libs/binder/include/binder/IBatteryStats.h +++ b/libs/binder/include/binder/IBatteryStats.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef ANDROID_IBATTERYSTATS_H -#define ANDROID_IBATTERYSTATS_H +#pragma once #ifndef __ANDROID_VNDK__ @@ -82,5 +81,3 @@ public: #else // __ANDROID_VNDK__ #error "This header is not visible to vendors" #endif // __ANDROID_VNDK__ - -#endif // ANDROID_IBATTERYSTATS_H diff --git a/libs/binder/include/binder/IBinder.h b/libs/binder/include/binder/IBinder.h index 7b37e8de0c..c8fb448a2d 100644 --- a/libs/binder/include/binder/IBinder.h +++ b/libs/binder/include/binder/IBinder.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef ANDROID_IBINDER_H -#define ANDROID_IBINDER_H +#pragma once #include <utils/Errors.h> #include <utils/RefBase.h> @@ -257,5 +256,3 @@ private: } // namespace android // --------------------------------------------------------------------------- - -#endif // ANDROID_IBINDER_H diff --git a/libs/binder/include/binder/IInterface.h b/libs/binder/include/binder/IInterface.h index 7116154951..f4a21ddd86 100644 --- a/libs/binder/include/binder/IInterface.h +++ b/libs/binder/include/binder/IInterface.h @@ -14,9 +14,7 @@ * limitations under the License. */ -// -#ifndef ANDROID_IINTERFACE_H -#define ANDROID_IINTERFACE_H +#pragma once #include <binder/Binder.h> @@ -335,5 +333,3 @@ constexpr bool allowedManualInterface(const char* name) { } // namespace internal } // namespace android - -#endif // ANDROID_IINTERFACE_H diff --git a/libs/binder/include/binder/IMediaResourceMonitor.h b/libs/binder/include/binder/IMediaResourceMonitor.h index da2b7cf62d..ac4b4cad5e 100644 --- a/libs/binder/include/binder/IMediaResourceMonitor.h +++ b/libs/binder/include/binder/IMediaResourceMonitor.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef ANDROID_I_MEDIA_RESOURCE_MONITOR_H -#define ANDROID_I_MEDIA_RESOURCE_MONITOR_H +#pragma once #ifndef __ANDROID_VNDK__ @@ -57,5 +56,3 @@ public: #else // __ANDROID_VNDK__ #error "This header is not visible to vendors" #endif // __ANDROID_VNDK__ - -#endif // ANDROID_I_MEDIA_RESOURCE_MONITOR_H diff --git a/libs/binder/include/binder/IMemory.h b/libs/binder/include/binder/IMemory.h index 1a36eb0436..d8b7ec1fb7 100644 --- a/libs/binder/include/binder/IMemory.h +++ b/libs/binder/include/binder/IMemory.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef ANDROID_IMEMORY_H -#define ANDROID_IMEMORY_H +#pragma once #include <stdint.h> #include <sys/types.h> @@ -124,5 +123,3 @@ protected: // ---------------------------------------------------------------------------- } // namespace android - -#endif // ANDROID_IMEMORY_H diff --git a/libs/binder/include/binder/IPCThreadState.h b/libs/binder/include/binder/IPCThreadState.h index 49ef253083..a3712c9c3b 100644 --- a/libs/binder/include/binder/IPCThreadState.h +++ b/libs/binder/include/binder/IPCThreadState.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef ANDROID_IPC_THREAD_STATE_H -#define ANDROID_IPC_THREAD_STATE_H +#pragma once #include <utils/Errors.h> #include <binder/Parcel.h> @@ -214,5 +213,3 @@ private: } // namespace android // --------------------------------------------------------------------------- - -#endif // ANDROID_IPC_THREAD_STATE_H diff --git a/libs/binder/include/binder/IPermissionController.h b/libs/binder/include/binder/IPermissionController.h index 4b66df8d6e..a4f93d9b56 100644 --- a/libs/binder/include/binder/IPermissionController.h +++ b/libs/binder/include/binder/IPermissionController.h @@ -14,9 +14,7 @@ * limitations under the License. */ -// -#ifndef ANDROID_IPERMISSION_CONTROLLER_H -#define ANDROID_IPERMISSION_CONTROLLER_H +#pragma once #ifndef __ANDROID_VNDK__ @@ -70,6 +68,3 @@ public: #else // __ANDROID_VNDK__ #error "This header is not visible to vendors" #endif // __ANDROID_VNDK__ - -#endif // ANDROID_IPERMISSION_CONTROLLER_H - diff --git a/libs/binder/include/binder/IProcessInfoService.h b/libs/binder/include/binder/IProcessInfoService.h index ca30ad3b95..622f23162f 100644 --- a/libs/binder/include/binder/IProcessInfoService.h +++ b/libs/binder/include/binder/IProcessInfoService.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef ANDROID_I_PROCESS_INFO_SERVICE_H -#define ANDROID_I_PROCESS_INFO_SERVICE_H +#pragma once #ifndef __ANDROID_VNDK__ @@ -51,5 +50,3 @@ public: #else // __ANDROID_VNDK__ #error "This header is not visible to vendors" #endif // __ANDROID_VNDK__ - -#endif // ANDROID_I_PROCESS_INFO_SERVICE_H diff --git a/libs/binder/include/binder/IResultReceiver.h b/libs/binder/include/binder/IResultReceiver.h index 70e99e7c38..5434445cf8 100644 --- a/libs/binder/include/binder/IResultReceiver.h +++ b/libs/binder/include/binder/IResultReceiver.h @@ -14,9 +14,7 @@ * limitations under the License. */ -// -#ifndef ANDROID_IRESULT_RECEIVER_H -#define ANDROID_IRESULT_RECEIVER_H +#pragma once #include <binder/IInterface.h> @@ -51,6 +49,3 @@ public: // ---------------------------------------------------------------------- } // namespace android - -#endif // ANDROID_IRESULT_RECEIVER_H - diff --git a/libs/binder/include/binder/IServiceManager.h b/libs/binder/include/binder/IServiceManager.h index 3c5ccc1922..5f0d056c5d 100644 --- a/libs/binder/include/binder/IServiceManager.h +++ b/libs/binder/include/binder/IServiceManager.h @@ -14,9 +14,7 @@ * limitations under the License. */ -// -#ifndef ANDROID_ISERVICE_MANAGER_H -#define ANDROID_ISERVICE_MANAGER_H +#pragma once #include <binder/IInterface.h> #include <utils/Vector.h> @@ -164,6 +162,3 @@ bool checkCallingPermission(const String16& permission, bool checkPermission(const String16& permission, pid_t pid, uid_t uid); } // namespace android - -#endif // ANDROID_ISERVICE_MANAGER_H - diff --git a/libs/binder/include/binder/IShellCallback.h b/libs/binder/include/binder/IShellCallback.h index b7ab6eab88..17e34db284 100644 --- a/libs/binder/include/binder/IShellCallback.h +++ b/libs/binder/include/binder/IShellCallback.h @@ -14,9 +14,7 @@ * limitations under the License. */ -// -#ifndef ANDROID_ISHELL_CALLBACK_H -#define ANDROID_ISHELL_CALLBACK_H +#pragma once #include <binder/IInterface.h> @@ -52,6 +50,3 @@ public: // ---------------------------------------------------------------------- } // namespace android - -#endif // ANDROID_ISHELL_CALLBACK_H - diff --git a/libs/binder/include/binder/IUidObserver.h b/libs/binder/include/binder/IUidObserver.h index d0703901d7..9291c0b45f 100644 --- a/libs/binder/include/binder/IUidObserver.h +++ b/libs/binder/include/binder/IUidObserver.h @@ -14,9 +14,7 @@ * limitations under the License. */ -// -#ifndef ANDROID_IUID_OBSERVER_H -#define ANDROID_IUID_OBSERVER_H +#pragma once #ifndef __ANDROID_VNDK__ @@ -64,5 +62,3 @@ public: #else // __ANDROID_VNDK__ #error "This header is not visible to vendors" #endif // __ANDROID_VNDK__ - -#endif // ANDROID_IUID_OBSERVER_H diff --git a/libs/binder/include/binder/IpPrefix.h b/libs/binder/include/binder/IpPrefix.h index c7e7a508fa..c1cd3c22ba 100644 --- a/libs/binder/include/binder/IpPrefix.h +++ b/libs/binder/include/binder/IpPrefix.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef ANDROID_IP_PREFIX_H -#define ANDROID_IP_PREFIX_H +#pragma once #ifndef __ANDROID_VNDK__ @@ -90,5 +89,3 @@ private: #else // __ANDROID_VNDK__ #error "This header is not visible to vendors" #endif // __ANDROID_VNDK__ - -#endif // ANDROID_IP_PREFIX_H diff --git a/libs/binder/include/binder/MemoryBase.h b/libs/binder/include/binder/MemoryBase.h index 4dd363808c..61a029cd1d 100644 --- a/libs/binder/include/binder/MemoryBase.h +++ b/libs/binder/include/binder/MemoryBase.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef ANDROID_MEMORY_BASE_H -#define ANDROID_MEMORY_BASE_H +#pragma once #include <stdlib.h> #include <stdint.h> @@ -47,5 +46,3 @@ private: // --------------------------------------------------------------------------- } // namespace android - -#endif // ANDROID_MEMORY_BASE_H diff --git a/libs/binder/include/binder/MemoryDealer.h b/libs/binder/include/binder/MemoryDealer.h index 6c1c4122d8..e72777252a 100644 --- a/libs/binder/include/binder/MemoryDealer.h +++ b/libs/binder/include/binder/MemoryDealer.h @@ -14,9 +14,7 @@ * limitations under the License. */ -#ifndef ANDROID_MEMORY_DEALER_H -#define ANDROID_MEMORY_DEALER_H - +#pragma once #include <stdint.h> #include <sys/types.h> @@ -60,5 +58,3 @@ private: // ---------------------------------------------------------------------------- } // namespace android - -#endif // ANDROID_MEMORY_DEALER_H diff --git a/libs/binder/include/binder/MemoryHeapBase.h b/libs/binder/include/binder/MemoryHeapBase.h index 0ece1215dd..dd76943ac7 100644 --- a/libs/binder/include/binder/MemoryHeapBase.h +++ b/libs/binder/include/binder/MemoryHeapBase.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef ANDROID_MEMORY_HEAP_BASE_H -#define ANDROID_MEMORY_HEAP_BASE_H +#pragma once #include <stdlib.h> #include <stdint.h> @@ -93,5 +92,3 @@ private: // --------------------------------------------------------------------------- } // namespace android - -#endif // ANDROID_MEMORY_HEAP_BASE_H diff --git a/libs/binder/include/binder/Parcel.h b/libs/binder/include/binder/Parcel.h index 2986adecc7..138d957906 100644 --- a/libs/binder/include/binder/Parcel.h +++ b/libs/binder/include/binder/Parcel.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef ANDROID_PARCEL_H -#define ANDROID_PARCEL_H +#pragma once #include <map> // for legacy reasons #include <string> @@ -1337,5 +1336,3 @@ inline TextOutput& operator<<(TextOutput& to, const Parcel& parcel) } // namespace android // --------------------------------------------------------------------------- - -#endif // ANDROID_PARCEL_H diff --git a/libs/binder/include/binder/ParcelFileDescriptor.h b/libs/binder/include/binder/ParcelFileDescriptor.h index 71e1d3cbb4..4ba6ba8ed2 100644 --- a/libs/binder/include/binder/ParcelFileDescriptor.h +++ b/libs/binder/include/binder/ParcelFileDescriptor.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef ANDROID_PARCEL_FILE_DESCRIPTOR_H_ -#define ANDROID_PARCEL_FILE_DESCRIPTOR_H_ +#pragma once #include <android-base/unique_fd.h> #include <binder/Parcel.h> @@ -67,5 +66,3 @@ private: } // namespace os } // namespace android - -#endif // ANDROID_OS_PARCEL_FILE_DESCRIPTOR_H_ diff --git a/libs/binder/include/binder/Parcelable.h b/libs/binder/include/binder/Parcelable.h index a6e610ca19..2c652be0e9 100644 --- a/libs/binder/include/binder/Parcelable.h +++ b/libs/binder/include/binder/Parcelable.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef ANDROID_PARCELABLE_H -#define ANDROID_PARCELABLE_H +#pragma once #include <vector> @@ -74,5 +73,3 @@ public: #endif } // namespace android - -#endif // ANDROID_PARCELABLE_H diff --git a/libs/binder/include/binder/PermissionCache.h b/libs/binder/include/binder/PermissionCache.h index c2582150df..835a3a8eb8 100644 --- a/libs/binder/include/binder/PermissionCache.h +++ b/libs/binder/include/binder/PermissionCache.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef BINDER_PERMISSION_H -#define BINDER_PERMISSION_H +#pragma once #ifndef __ANDROID_VNDK__ @@ -82,5 +81,3 @@ public: #else // __ANDROID_VNDK__ #error "This header is not visible to vendors" #endif // __ANDROID_VNDK__ - -#endif /* BINDER_PERMISSION_H */ diff --git a/libs/binder/include/binder/PermissionController.h b/libs/binder/include/binder/PermissionController.h index 4db522ab1f..e65857417b 100644 --- a/libs/binder/include/binder/PermissionController.h +++ b/libs/binder/include/binder/PermissionController.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef ANDROID_PERMISSION_CONTROLLER_H -#define ANDROID_PERMISSION_CONTROLLER_H +#pragma once #ifndef __ANDROID_VNDK__ @@ -65,5 +64,3 @@ private: #else // __ANDROID_VNDK__ #error "This header is not visible to vendors" #endif // __ANDROID_VNDK__ - -#endif // ANDROID_PERMISSION_CONTROLLER_H diff --git a/libs/binder/include/binder/PersistableBundle.h b/libs/binder/include/binder/PersistableBundle.h index 322fef9e4f..4517cf290e 100644 --- a/libs/binder/include/binder/PersistableBundle.h +++ b/libs/binder/include/binder/PersistableBundle.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef ANDROID_PERSISTABLE_BUNDLE_H -#define ANDROID_PERSISTABLE_BUNDLE_H +#pragma once #include <map> #include <set> @@ -128,5 +127,3 @@ private: } // namespace os } // namespace android - -#endif // ANDROID_PERSISTABLE_BUNDLE_H diff --git a/libs/binder/include/binder/ProcessInfoService.h b/libs/binder/include/binder/ProcessInfoService.h index 6bfd1bc17d..6b3b5ce4df 100644 --- a/libs/binder/include/binder/ProcessInfoService.h +++ b/libs/binder/include/binder/ProcessInfoService.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef ANDROID_PROCESS_INFO_SERVICE_H -#define ANDROID_PROCESS_INFO_SERVICE_H +#pragma once #ifndef __ANDROID_VNDK__ @@ -83,6 +82,3 @@ public: #else // __ANDROID_VNDK__ #error "This header is not visible to vendors" #endif // __ANDROID_VNDK__ - -#endif // ANDROID_PROCESS_INFO_SERVICE_H - diff --git a/libs/binder/include/binder/ProcessState.h b/libs/binder/include/binder/ProcessState.h index efb95f4316..46457cdc73 100644 --- a/libs/binder/include/binder/ProcessState.h +++ b/libs/binder/include/binder/ProcessState.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef ANDROID_PROCESS_STATE_H -#define ANDROID_PROCESS_STATE_H +#pragma once #include <binder/IBinder.h> #include <utils/KeyedVector.h> @@ -132,5 +131,3 @@ private: } // namespace android // --------------------------------------------------------------------------- - -#endif // ANDROID_PROCESS_STATE_H diff --git a/libs/binder/include/binder/TextOutput.h b/libs/binder/include/binder/TextOutput.h index c7e1e14218..bf9c92bfc5 100644 --- a/libs/binder/include/binder/TextOutput.h +++ b/libs/binder/include/binder/TextOutput.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef ANDROID_TEXTOUTPUT_H -#define ANDROID_TEXTOUTPUT_H +#pragma once #include <utils/Errors.h> #include <utils/String8.h> @@ -206,5 +205,3 @@ inline bool HexDump::carrayStyle() const { return mCArrayStyle; } // --------------------------------------------------------------------------- } // namespace android - -#endif // ANDROID_TEXTOUTPUT_H |