From 0795272aa226f4e965968a03daddc53ce30b7cda Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Tue, 19 May 2009 19:08:10 -0700 Subject: [PATCH] move libbinder's header files under includes/binder --- camera/libcameraservice/CameraHardwareStub.h | 4 +- camera/libcameraservice/CameraService.cpp | 8 +- cmds/app_process/app_main.cpp | 4 +- cmds/dumpsys/dumpsys.cpp | 6 +- cmds/runtime/ServiceManager.cpp | 4 +- cmds/runtime/main_runtime.cpp | 4 +- cmds/service/service.cpp | 6 +- cmds/surfaceflinger/main_surfaceflinger.cpp | 6 +- cmds/system_server/library/system_init.cpp | 6 +- cmds/system_server/system_main.cpp | 2 +- core/jni/ActivityManager.cpp | 6 +- core/jni/AndroidRuntime.cpp | 6 +- core/jni/CursorWindow.cpp | 2 +- core/jni/CursorWindow.h | 2 +- core/jni/android/graphics/Bitmap.cpp | 2 +- core/jni/android/graphics/Region.cpp | 2 +- core/jni/android_hardware_Camera.cpp | 2 +- core/jni/android_media_AudioTrack.cpp | 4 +- core/jni/android_util_Binder.cpp | 10 +-- core/jni/android_util_Binder.h | 2 +- core/jni/android_util_Process.cpp | 6 +- include/android_runtime/AndroidRuntime.h | 2 +- include/{utils => binder}/Binder.h | 2 +- include/{utils => binder}/BpBinder.h | 2 +- include/{utils => binder}/IBinder.h | 0 include/{utils => binder}/IInterface.h | 2 +- include/{utils => binder}/IMemory.h | 2 +- include/{utils => binder}/IPCThreadState.h | 4 +- .../{utils => binder}/IPermissionController.h | 2 +- include/{utils => binder}/IServiceManager.h | 4 +- include/{utils => binder}/MemoryBase.h | 2 +- include/{utils => binder}/MemoryDealer.h | 4 +- include/{utils => binder}/MemoryHeapBase.h | 2 +- include/{utils => binder}/MemoryHeapPmem.h | 6 +- include/{utils => binder}/Parcel.h | 0 include/{utils => binder}/ProcessState.h | 2 +- include/media/AudioRecord.h | 4 +- include/media/AudioTrack.h | 4 +- include/media/IAudioFlinger.h | 2 +- include/media/IAudioFlingerClient.h | 2 +- include/media/IAudioRecord.h | 4 +- include/media/IAudioTrack.h | 4 +- include/media/IMediaMetadataRetriever.h | 6 +- include/media/IMediaPlayer.h | 4 +- include/media/IMediaPlayerClient.h | 4 +- include/media/IMediaPlayerService.h | 4 +- include/media/IMediaRecorder.h | 2 +- include/media/mediametadataretriever.h | 2 +- include/media/mediaplayer.h | 2 +- include/private/binder/Static.h | 10 +-- include/private/utils/Static.h | 26 ------ include/ui/CameraHardwareInterface.h | 2 +- include/ui/ICamera.h | 6 +- include/ui/ICameraClient.h | 6 +- include/ui/ICameraService.h | 4 +- include/ui/IOverlay.h | 2 +- include/ui/ISurface.h | 2 +- include/ui/ISurfaceComposer.h | 2 +- include/ui/ISurfaceFlingerClient.h | 2 +- include/ui/Overlay.h | 2 +- include/ui/Region.h | 2 +- libs/audioflinger/AudioFlinger.cpp | 6 +- libs/audioflinger/AudioFlinger.h | 2 +- libs/binder/Binder.cpp | 8 +- libs/binder/BpBinder.cpp | 4 +- libs/binder/IDataConnection.cpp | 89 ------------------- libs/binder/IInterface.cpp | 2 +- libs/binder/IMemory.cpp | 4 +- libs/binder/IPCThreadState.cpp | 6 +- libs/binder/IPermissionController.cpp | 4 +- libs/binder/IServiceManager.cpp | 6 +- libs/binder/MemoryBase.cpp | 2 +- libs/binder/MemoryDealer.cpp | 6 +- libs/binder/MemoryHeapBase.cpp | 2 +- libs/binder/MemoryHeapPmem.cpp | 4 +- libs/binder/Parcel.cpp | 8 +- libs/binder/ProcessState.cpp | 8 +- libs/binder/Static.cpp | 2 +- .../GPUHardware/GPUHardware.cpp | 12 +-- libs/surfaceflinger/LayerBitmap.cpp | 4 +- libs/surfaceflinger/LayerBuffer.cpp | 4 +- libs/surfaceflinger/LayerBuffer.h | 2 +- libs/surfaceflinger/LayerOrientationAnim.h | 2 +- .../LayerOrientationAnimRotate.h | 2 +- libs/surfaceflinger/SurfaceFlinger.cpp | 8 +- libs/surfaceflinger/SurfaceFlinger.h | 2 +- libs/surfaceflinger/VRamHeap.cpp | 8 +- libs/surfaceflinger/VRamHeap.h | 2 +- .../tests/overlays/overlays.cpp | 6 +- libs/ui/Camera.cpp | 4 +- libs/ui/EventHub.cpp | 1 - libs/ui/ICamera.cpp | 2 +- libs/ui/ICameraService.cpp | 6 +- libs/ui/IOverlay.cpp | 4 +- libs/ui/ISurface.cpp | 4 +- libs/ui/ISurfaceComposer.cpp | 8 +- libs/ui/ISurfaceFlingerClient.cpp | 8 +- libs/ui/LayerState.cpp | 2 +- libs/ui/Overlay.cpp | 6 +- libs/ui/Surface.cpp | 4 +- libs/ui/SurfaceComposerClient.cpp | 8 +- libs/ui/SurfaceFlingerSynchro.cpp | 2 +- media/libmedia/AudioRecord.cpp | 8 +- media/libmedia/AudioSystem.cpp | 2 +- media/libmedia/AudioTrack.cpp | 6 +- media/libmedia/IAudioFlinger.cpp | 2 +- media/libmedia/IAudioFlingerClient.cpp | 2 +- media/libmedia/IAudioRecord.cpp | 2 +- media/libmedia/IAudioTrack.cpp | 2 +- media/libmedia/IMediaMetadataRetriever.cpp | 2 +- media/libmedia/IMediaPlayer.cpp | 2 +- media/libmedia/IMediaPlayerClient.cpp | 4 +- media/libmedia/IMediaPlayerService.cpp | 4 +- media/libmedia/IMediaRecorder.cpp | 2 +- media/libmedia/mediametadataretriever.cpp | 4 +- media/libmedia/mediaplayer.cpp | 6 +- media/libmedia/mediarecorder.cpp | 2 +- .../MediaPlayerService.cpp | 8 +- .../MediaRecorderClient.cpp | 8 +- .../MetadataRetrieverClient.cpp | 6 +- .../MetadataRetrieverClient.h | 2 +- media/mediaserver/main_mediaserver.cpp | 6 +- media/sdutils/sdutil.cpp | 4 +- opengl/libs/EGL/gpu.cpp | 8 +- 124 files changed, 245 insertions(+), 361 deletions(-) rename include/{utils => binder}/Binder.h (99%) rename include/{utils => binder}/BpBinder.h (99%) rename include/{utils => binder}/IBinder.h (100%) rename include/{utils => binder}/IInterface.h (99%) rename include/{utils => binder}/IMemory.h (98%) rename include/{utils => binder}/IPCThreadState.h (98%) rename include/{utils => binder}/IPermissionController.h (98%) rename include/{utils => binder}/IServiceManager.h (97%) rename include/{utils => binder}/MemoryBase.h (98%) rename include/{utils => binder}/MemoryDealer.h (99%) rename include/{utils => binder}/MemoryHeapBase.h (99%) rename include/{utils => binder}/MemoryHeapPmem.h (96%) rename include/{utils => binder}/Parcel.h (100%) rename include/{utils => binder}/ProcessState.h (99%) delete mode 100644 libs/binder/IDataConnection.cpp diff --git a/camera/libcameraservice/CameraHardwareStub.h b/camera/libcameraservice/CameraHardwareStub.h index 0d26d47ececb3..efae935d0a7bc 100644 --- a/camera/libcameraservice/CameraHardwareStub.h +++ b/camera/libcameraservice/CameraHardwareStub.h @@ -21,8 +21,8 @@ #include "FakeCamera.h" #include #include -#include -#include +#include +#include #include namespace android { diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp index f85ea9f85054c..4f0fe21b16035 100644 --- a/camera/libcameraservice/CameraService.cpp +++ b/camera/libcameraservice/CameraService.cpp @@ -20,12 +20,12 @@ #define LOG_TAG "CameraService" #include -#include -#include +#include +#include #include #include -#include -#include +#include +#include #include #include diff --git a/cmds/app_process/app_main.cpp b/cmds/app_process/app_main.cpp index d825d5a3a4dcb..7decf9ae737d6 100644 --- a/cmds/app_process/app_main.cpp +++ b/cmds/app_process/app_main.cpp @@ -7,8 +7,8 @@ #define LOG_TAG "appproc" -#include -#include +#include +#include #include #include #include diff --git a/cmds/dumpsys/dumpsys.cpp b/cmds/dumpsys/dumpsys.cpp index a62fe55600e93..945a690ae0ab2 100644 --- a/cmds/dumpsys/dumpsys.cpp +++ b/cmds/dumpsys/dumpsys.cpp @@ -6,9 +6,9 @@ #define LOG_TAG "dumpsys" #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/cmds/runtime/ServiceManager.cpp b/cmds/runtime/ServiceManager.cpp index 758a95c07d56a..b2bef07ff70e7 100644 --- a/cmds/runtime/ServiceManager.cpp +++ b/cmds/runtime/ServiceManager.cpp @@ -9,9 +9,9 @@ #include #include -#include +#include #include -#include +#include #include diff --git a/cmds/runtime/main_runtime.cpp b/cmds/runtime/main_runtime.cpp index 1531a9efd154d..718ea67e0142c 100644 --- a/cmds/runtime/main_runtime.cpp +++ b/cmds/runtime/main_runtime.cpp @@ -8,8 +8,8 @@ #include "SignalHandler.h" #include -#include -#include +#include +#include #include #include diff --git a/cmds/service/service.cpp b/cmds/service/service.cpp index 859a9bf9f93cc..32db83ba1dcb1 100644 --- a/cmds/service/service.cpp +++ b/cmds/service/service.cpp @@ -3,9 +3,9 @@ * */ -#include -#include -#include +#include +#include +#include #include #include diff --git a/cmds/surfaceflinger/main_surfaceflinger.cpp b/cmds/surfaceflinger/main_surfaceflinger.cpp index 7c895783d7625..d650721327832 100644 --- a/cmds/surfaceflinger/main_surfaceflinger.cpp +++ b/cmds/surfaceflinger/main_surfaceflinger.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #include #include diff --git a/cmds/system_server/library/system_init.cpp b/cmds/system_server/library/system_init.cpp index 73b23e27e3bd9..ea78461216f3c 100644 --- a/cmds/system_server/library/system_init.cpp +++ b/cmds/system_server/library/system_init.cpp @@ -8,9 +8,9 @@ #define LOG_TAG "sysproc" -#include -#include -#include +#include +#include +#include #include #include diff --git a/cmds/system_server/system_main.cpp b/cmds/system_server/system_main.cpp index ca16e57006229..543f650a4d228 100644 --- a/cmds/system_server/system_main.cpp +++ b/cmds/system_server/system_main.cpp @@ -9,7 +9,7 @@ #define LOG_TAG "sysproc" -#include +#include #include #include diff --git a/core/jni/ActivityManager.cpp b/core/jni/ActivityManager.cpp index 90178273355ad..8950dfb0ce188 100644 --- a/core/jni/ActivityManager.cpp +++ b/core/jni/ActivityManager.cpp @@ -16,9 +16,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include namespace android { diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 592263a58a3e5..2bb1b384d02c5 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -19,11 +19,11 @@ //#define LOG_NDEBUG 0 #include -#include -#include +#include +#include #include #include -#include +#include #include #include #include diff --git a/core/jni/CursorWindow.cpp b/core/jni/CursorWindow.cpp index fb891c9c9cd6e..78641899856de 100644 --- a/core/jni/CursorWindow.cpp +++ b/core/jni/CursorWindow.cpp @@ -18,7 +18,7 @@ #define LOG_TAG "CursorWindow" #include -#include +#include #include #include diff --git a/core/jni/CursorWindow.h b/core/jni/CursorWindow.h index 0fb074f4b7abf..e98b00996c366 100644 --- a/core/jni/CursorWindow.h +++ b/core/jni/CursorWindow.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp index 65f44d5042576..29d8d3cd29f73 100644 --- a/core/jni/android/graphics/Bitmap.cpp +++ b/core/jni/android/graphics/Bitmap.cpp @@ -5,7 +5,7 @@ #include "SkDither.h" #include "SkUnPreMultiply.h" -#include "Parcel.h" +#include #include "android_util_Binder.h" #include "android_nio_utils.h" #include "CreateJavaOutputStreamAdaptor.h" diff --git a/core/jni/android/graphics/Region.cpp b/core/jni/android/graphics/Region.cpp index 1dc031472b213..723cd37b88778 100644 --- a/core/jni/android/graphics/Region.cpp +++ b/core/jni/android/graphics/Region.cpp @@ -134,7 +134,7 @@ static void Region_scale(JNIEnv* env, jobject region, jfloat scale, jobject dst) //////////////////////////////////////////////////////////////////////////////////////////////////////////// -#include "Parcel.h" +#include #include "android_util_Binder.h" static SkRegion* Region_createFromParcel(JNIEnv* env, jobject clazz, jobject parcel) diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp index c10799316b81d..31086b8fb5bd5 100644 --- a/core/jni/android_hardware_Camera.cpp +++ b/core/jni/android_hardware_Camera.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include using namespace android; diff --git a/core/jni/android_media_AudioTrack.cpp b/core/jni/android_media_AudioTrack.cpp index 42ada5450744a..0cce3a6050389 100644 --- a/core/jni/android_media_AudioTrack.cpp +++ b/core/jni/android_media_AudioTrack.cpp @@ -30,8 +30,8 @@ #include "media/AudioSystem.h" #include "media/AudioTrack.h" -#include -#include +#include +#include // ---------------------------------------------------------------------------- diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp index 73254320bdf4b..f0885fde1c65c 100644 --- a/core/jni/android_util_Binder.cpp +++ b/core/jni/android_util_Binder.cpp @@ -25,12 +25,12 @@ #include #include -#include -#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include diff --git a/core/jni/android_util_Binder.h b/core/jni/android_util_Binder.h index 16d993da3a06e..495e76a982858 100644 --- a/core/jni/android_util_Binder.h +++ b/core/jni/android_util_Binder.h @@ -15,7 +15,7 @@ ** limitations under the License. */ -#include +#include #include "jni.h" diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp index 95c38dc370b51..e8bffa4f1523b 100644 --- a/core/jni/android_util_Process.cpp +++ b/core/jni/android_util_Process.cpp @@ -18,9 +18,9 @@ #define LOG_TAG "Process" #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/include/android_runtime/AndroidRuntime.h b/include/android_runtime/AndroidRuntime.h index 0304309963cef..99ab2f0b733e8 100644 --- a/include/android_runtime/AndroidRuntime.h +++ b/include/android_runtime/AndroidRuntime.h @@ -20,7 +20,7 @@ #define _RUNTIME_ANDROID_RUNTIME_H #include -#include +#include #include #include #include diff --git a/include/utils/Binder.h b/include/binder/Binder.h similarity index 99% rename from include/utils/Binder.h rename to include/binder/Binder.h index b5b8d98513d68..c9b71fd48604a 100644 --- a/include/utils/Binder.h +++ b/include/binder/Binder.h @@ -17,7 +17,7 @@ #ifndef ANDROID_BINDER_H #define ANDROID_BINDER_H -#include +#include // --------------------------------------------------------------------------- namespace android { diff --git a/include/utils/BpBinder.h b/include/binder/BpBinder.h similarity index 99% rename from include/utils/BpBinder.h rename to include/binder/BpBinder.h index 7b96e296f2ecc..067637eaeac49 100644 --- a/include/utils/BpBinder.h +++ b/include/binder/BpBinder.h @@ -17,7 +17,7 @@ #ifndef ANDROID_BPBINDER_H #define ANDROID_BPBINDER_H -#include +#include #include #include diff --git a/include/utils/IBinder.h b/include/binder/IBinder.h similarity index 100% rename from include/utils/IBinder.h rename to include/binder/IBinder.h diff --git a/include/utils/IInterface.h b/include/binder/IInterface.h similarity index 99% rename from include/utils/IInterface.h rename to include/binder/IInterface.h index 959722a4d8af7..3b1e33bda123b 100644 --- a/include/utils/IInterface.h +++ b/include/binder/IInterface.h @@ -18,7 +18,7 @@ #ifndef ANDROID_IINTERFACE_H #define ANDROID_IINTERFACE_H -#include +#include namespace android { diff --git a/include/utils/IMemory.h b/include/binder/IMemory.h similarity index 98% rename from include/utils/IMemory.h rename to include/binder/IMemory.h index 35a3fd7da2037..182792cf06855 100644 --- a/include/utils/IMemory.h +++ b/include/binder/IMemory.h @@ -23,7 +23,7 @@ #include #include -#include +#include namespace android { diff --git a/include/utils/IPCThreadState.h b/include/binder/IPCThreadState.h similarity index 98% rename from include/utils/IPCThreadState.h rename to include/binder/IPCThreadState.h index 0490fd3ec2063..78306b2b90e0f 100644 --- a/include/utils/IPCThreadState.h +++ b/include/binder/IPCThreadState.h @@ -18,8 +18,8 @@ #define ANDROID_IPC_THREAD_STATE_H #include -#include -#include +#include +#include #include #ifdef HAVE_WIN32_PROC diff --git a/include/utils/IPermissionController.h b/include/binder/IPermissionController.h similarity index 98% rename from include/utils/IPermissionController.h rename to include/binder/IPermissionController.h index cb1dd345d7649..f9d371bd1582f 100644 --- a/include/utils/IPermissionController.h +++ b/include/binder/IPermissionController.h @@ -18,7 +18,7 @@ #ifndef ANDROID_IPERMISSION_CONTROLLER_H #define ANDROID_IPERMISSION_CONTROLLER_H -#include +#include namespace android { diff --git a/include/utils/IServiceManager.h b/include/binder/IServiceManager.h similarity index 97% rename from include/utils/IServiceManager.h rename to include/binder/IServiceManager.h index e3d99fe7effdd..ea149ddaabeae 100644 --- a/include/utils/IServiceManager.h +++ b/include/binder/IServiceManager.h @@ -18,8 +18,8 @@ #ifndef ANDROID_ISERVICE_MANAGER_H #define ANDROID_ISERVICE_MANAGER_H -#include -#include +#include +#include #include #include diff --git a/include/utils/MemoryBase.h b/include/binder/MemoryBase.h similarity index 98% rename from include/utils/MemoryBase.h rename to include/binder/MemoryBase.h index eb5a9d275a109..463e26d9772fa 100644 --- a/include/utils/MemoryBase.h +++ b/include/binder/MemoryBase.h @@ -20,7 +20,7 @@ #include #include -#include +#include namespace android { diff --git a/include/utils/MemoryDealer.h b/include/binder/MemoryDealer.h similarity index 99% rename from include/utils/MemoryDealer.h rename to include/binder/MemoryDealer.h index 454b6270e4bd1..097767f8cf362 100644 --- a/include/utils/MemoryDealer.h +++ b/include/binder/MemoryDealer.h @@ -21,9 +21,9 @@ #include #include -#include +#include #include -#include +#include namespace android { // ---------------------------------------------------------------------------- diff --git a/include/utils/MemoryHeapBase.h b/include/binder/MemoryHeapBase.h similarity index 99% rename from include/utils/MemoryHeapBase.h rename to include/binder/MemoryHeapBase.h index 574acf4f9ff83..83c72835e240c 100644 --- a/include/utils/MemoryHeapBase.h +++ b/include/binder/MemoryHeapBase.h @@ -20,7 +20,7 @@ #include #include -#include +#include namespace android { diff --git a/include/utils/MemoryHeapPmem.h b/include/binder/MemoryHeapPmem.h similarity index 96% rename from include/utils/MemoryHeapPmem.h rename to include/binder/MemoryHeapPmem.h index 60335adaef746..dbf26ff1ffc63 100644 --- a/include/utils/MemoryHeapPmem.h +++ b/include/binder/MemoryHeapPmem.h @@ -20,9 +20,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include namespace android { diff --git a/include/utils/Parcel.h b/include/binder/Parcel.h similarity index 100% rename from include/utils/Parcel.h rename to include/binder/Parcel.h diff --git a/include/utils/ProcessState.h b/include/binder/ProcessState.h similarity index 99% rename from include/utils/ProcessState.h rename to include/binder/ProcessState.h index 39584f42c7f43..feeb3c3891261 100644 --- a/include/utils/ProcessState.h +++ b/include/binder/ProcessState.h @@ -17,7 +17,7 @@ #ifndef ANDROID_PROCESS_STATE_H #define ANDROID_PROCESS_STATE_H -#include +#include #include #include #include diff --git a/include/media/AudioRecord.h b/include/media/AudioRecord.h index 6aa40d008eba8..e962db6e0ce4c 100644 --- a/include/media/AudioRecord.h +++ b/include/media/AudioRecord.h @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index ba0467c1603c6..0955819a2c3d4 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/include/media/IAudioFlinger.h b/include/media/IAudioFlinger.h index 6f13fe0b52c25..031335e1bf516 100644 --- a/include/media/IAudioFlinger.h +++ b/include/media/IAudioFlinger.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/media/IAudioFlingerClient.h b/include/media/IAudioFlingerClient.h index c3deb0b4e8f28..383ec0c7a519f 100644 --- a/include/media/IAudioFlingerClient.h +++ b/include/media/IAudioFlingerClient.h @@ -19,7 +19,7 @@ #include -#include +#include namespace android { diff --git a/include/media/IAudioRecord.h b/include/media/IAudioRecord.h index 9d45d2d9ac25a..46735def2f529 100644 --- a/include/media/IAudioRecord.h +++ b/include/media/IAudioRecord.h @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include namespace android { diff --git a/include/media/IAudioTrack.h b/include/media/IAudioTrack.h index 12f2111110e4c..de6426af0069d 100644 --- a/include/media/IAudioTrack.h +++ b/include/media/IAudioTrack.h @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include namespace android { diff --git a/include/media/IMediaMetadataRetriever.h b/include/media/IMediaMetadataRetriever.h index c677e83ff7493..9baba8e8fdbd5 100644 --- a/include/media/IMediaMetadataRetriever.h +++ b/include/media/IMediaMetadataRetriever.h @@ -19,9 +19,9 @@ #define ANDROID_IMEDIAMETADATARETRIEVER_H #include -#include -#include -#include +#include +#include +#include namespace android { diff --git a/include/media/IMediaPlayer.h b/include/media/IMediaPlayer.h index a683e74d38838..2c4bc2aea9157 100644 --- a/include/media/IMediaPlayer.h +++ b/include/media/IMediaPlayer.h @@ -18,8 +18,8 @@ #define ANDROID_IMEDIAPLAYER_H #include -#include -#include +#include +#include namespace android { diff --git a/include/media/IMediaPlayerClient.h b/include/media/IMediaPlayerClient.h index 5d3281103fd71..eee6c9762f08b 100644 --- a/include/media/IMediaPlayerClient.h +++ b/include/media/IMediaPlayerClient.h @@ -18,8 +18,8 @@ #define ANDROID_IMEDIAPLAYERCLIENT_H #include -#include -#include +#include +#include namespace android { diff --git a/include/media/IMediaPlayerService.h b/include/media/IMediaPlayerService.h index 8125cc96dfc83..469098cc10abf 100644 --- a/include/media/IMediaPlayerService.h +++ b/include/media/IMediaPlayerService.h @@ -18,8 +18,8 @@ #define ANDROID_IMEDIAPLAYERSERVICE_H #include -#include -#include +#include +#include #include #include diff --git a/include/media/IMediaRecorder.h b/include/media/IMediaRecorder.h index 64d3a40a30978..24ac82b237718 100644 --- a/include/media/IMediaRecorder.h +++ b/include/media/IMediaRecorder.h @@ -18,7 +18,7 @@ #ifndef ANDROID_IMEDIARECORDER_H #define ANDROID_IMEDIARECORDER_H -#include +#include namespace android { diff --git a/include/media/mediametadataretriever.h b/include/media/mediametadataretriever.h index f2719d33ba994..3db8a0f76a2b9 100644 --- a/include/media/mediametadataretriever.h +++ b/include/media/mediametadataretriever.h @@ -20,7 +20,7 @@ #include // for status_t #include -#include +#include #include namespace android { diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h index 255a67b0d84ab..704a8cb40454f 100644 --- a/include/media/mediaplayer.h +++ b/include/media/mediaplayer.h @@ -17,7 +17,7 @@ #ifndef ANDROID_MEDIAPLAYER_H #define ANDROID_MEDIAPLAYER_H -#include +#include #include #include #include diff --git a/include/private/binder/Static.h b/include/private/binder/Static.h index cbdf2928afe5d..5b0f9fc652690 100644 --- a/include/private/binder/Static.h +++ b/include/private/binder/Static.h @@ -19,11 +19,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace android { diff --git a/include/private/utils/Static.h b/include/private/utils/Static.h index bd591b5f6530c..d95ae0d3ce249 100644 --- a/include/private/utils/Static.h +++ b/include/private/utils/Static.h @@ -20,16 +20,6 @@ #include #include -/* -#ifndef LIBUTILS_NATIVE -#include -#include -#include -#include -#include -#endif -*/ - namespace android { // For TextStream.cpp extern Vector gTextBuffers; @@ -42,20 +32,4 @@ extern void terminate_string8(); extern void initialize_string16(); extern void terminate_string16(); - -/* -#ifndef LIBUTILS_NATIVE - -// For ProcessState.cpp -extern Mutex gProcessMutex; -extern sp gProcess; - -// For ServiceManager.cpp -extern Mutex gDefaultServiceManagerLock; -extern sp gDefaultServiceManager; -extern sp gPermissionController; - -#endif -*/ - } // namespace android diff --git a/include/ui/CameraHardwareInterface.h b/include/ui/CameraHardwareInterface.h index 73036f0fa7837..2cdcc06abef6c 100644 --- a/include/ui/CameraHardwareInterface.h +++ b/include/ui/CameraHardwareInterface.h @@ -17,7 +17,7 @@ #ifndef ANDROID_HARDWARE_CAMERA_HARDWARE_INTERFACE_H #define ANDROID_HARDWARE_CAMERA_HARDWARE_INTERFACE_H -#include +#include #include #include #include diff --git a/include/ui/ICamera.h b/include/ui/ICamera.h index 241fb632616fa..1df791404156e 100644 --- a/include/ui/ICamera.h +++ b/include/ui/ICamera.h @@ -18,10 +18,10 @@ #define ANDROID_HARDWARE_ICAMERA_H #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/include/ui/ICameraClient.h b/include/ui/ICameraClient.h index c4bdd07585757..f38a6aad9078a 100644 --- a/include/ui/ICameraClient.h +++ b/include/ui/ICameraClient.h @@ -18,9 +18,9 @@ #define ANDROID_HARDWARE_ICAMERA_APP_H #include -#include -#include -#include +#include +#include +#include namespace android { diff --git a/include/ui/ICameraService.h b/include/ui/ICameraService.h index c652c5169a0a4..061681aa1f583 100644 --- a/include/ui/ICameraService.h +++ b/include/ui/ICameraService.h @@ -18,8 +18,8 @@ #define ANDROID_HARDWARE_ICAMERASERVICE_H #include -#include -#include +#include +#include #include #include diff --git a/include/ui/IOverlay.h b/include/ui/IOverlay.h index 699b1b063ff28..af3add10d958a 100644 --- a/include/ui/IOverlay.h +++ b/include/ui/IOverlay.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/include/ui/ISurface.h b/include/ui/ISurface.h index 87b320f431b88..136e801e2e943 100644 --- a/include/ui/ISurface.h +++ b/include/ui/ISurface.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/include/ui/ISurfaceComposer.h b/include/ui/ISurfaceComposer.h index 5c64b222bc5d4..5b062a87f395f 100644 --- a/include/ui/ISurfaceComposer.h +++ b/include/ui/ISurfaceComposer.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/include/ui/ISurfaceFlingerClient.h b/include/ui/ISurfaceFlingerClient.h index 5b9361d5d6364..b6cbb0b80b681 100644 --- a/include/ui/ISurfaceFlingerClient.h +++ b/include/ui/ISurfaceFlingerClient.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/include/ui/Overlay.h b/include/ui/Overlay.h index 66514b44ab9ff..9ba2f7b6fd1cd 100644 --- a/include/ui/Overlay.h +++ b/include/ui/Overlay.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/include/ui/Region.h b/include/ui/Region.h index 76896737f293d..68cb52ed35ffc 100644 --- a/include/ui/Region.h +++ b/include/ui/Region.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include diff --git a/libs/audioflinger/AudioFlinger.cpp b/libs/audioflinger/AudioFlinger.cpp index efcf2b02fef02..4b4fa5e295d3a 100644 --- a/libs/audioflinger/AudioFlinger.cpp +++ b/libs/audioflinger/AudioFlinger.cpp @@ -24,10 +24,10 @@ #include #include -#include +#include #include -#include -#include +#include +#include #include #include diff --git a/libs/audioflinger/AudioFlinger.h b/libs/audioflinger/AudioFlinger.h index c7ca9ecc10121..f3e6dc1eda793 100644 --- a/libs/audioflinger/AudioFlinger.h +++ b/libs/audioflinger/AudioFlinger.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/libs/binder/Binder.cpp b/libs/binder/Binder.cpp index 37e4685bc9971..26f29f8e98e01 100644 --- a/libs/binder/Binder.cpp +++ b/libs/binder/Binder.cpp @@ -14,12 +14,12 @@ * limitations under the License. */ -#include +#include #include -#include -#include -#include +#include +#include +#include #include diff --git a/libs/binder/BpBinder.cpp b/libs/binder/BpBinder.cpp index 69ab19574e642..56bf413c290ea 100644 --- a/libs/binder/BpBinder.cpp +++ b/libs/binder/BpBinder.cpp @@ -17,9 +17,9 @@ #define LOG_TAG "BpBinder" //#define LOG_NDEBUG 0 -#include +#include -#include +#include #include #include diff --git a/libs/binder/IDataConnection.cpp b/libs/binder/IDataConnection.cpp deleted file mode 100644 index c6d49aa485670..0000000000000 --- a/libs/binder/IDataConnection.cpp +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (C) 2006 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include - -#include - -#include - -namespace android { - -// --------------------------------------------------------------------------- - -enum -{ - CONNECT_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION, - DISCONNECT_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION + 1 -}; - -class BpDataConnection : public BpInterface -{ -public: - BpDataConnection::BpDataConnection(const sp& impl) - : BpInterface(impl) - { - } - - virtual void connect() - { - Parcel data, reply; - data.writeInterfaceToken(IDataConnection::descriptor()); - remote()->transact(CONNECT_TRANSACTION, data, &reply); - } - - virtual void disconnect() - { - Parcel data, reply; - remote()->transact(DISCONNECT_TRANSACTION, data, &reply); - } -}; - -IMPLEMENT_META_INTERFACE(DataConnection, "android.utils.IDataConnection"); - -#define CHECK_INTERFACE(interface, data, reply) \ - do { if (!data.enforceInterface(interface::getInterfaceDescriptor())) { \ - LOGW("Call incorrectly routed to " #interface); \ - return PERMISSION_DENIED; \ - } } while (0) - -status_t BnDataConnection::onTransact(uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags) -{ - switch(code) - { - case CONNECT_TRANSACTION: - { - CHECK_INTERFACE(IDataConnection, data, reply); - connect(); - return NO_ERROR; - } - - case DISCONNECT_TRANSACTION: - { - CHECK_INTERFACE(IDataConnection, data, reply); - disconnect(); - return NO_ERROR; - } - - default: - return BBinder::onTransact(code, data, reply, flags); - } -} - -// ---------------------------------------------------------------------------- - -}; // namespace android diff --git a/libs/binder/IInterface.cpp b/libs/binder/IInterface.cpp index 6ea817887cde4..9f1192f011b18 100644 --- a/libs/binder/IInterface.cpp +++ b/libs/binder/IInterface.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include namespace android { diff --git a/libs/binder/IMemory.cpp b/libs/binder/IMemory.cpp index 429bc2b9406b3..13d67c07de01f 100644 --- a/libs/binder/IMemory.cpp +++ b/libs/binder/IMemory.cpp @@ -25,11 +25,11 @@ #include #include -#include +#include #include #include #include -#include +#include #include #define VERBOSE 0 diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp index 704a48165d731..c3889e9855cf1 100644 --- a/libs/binder/IPCThreadState.cpp +++ b/libs/binder/IPCThreadState.cpp @@ -14,10 +14,10 @@ * limitations under the License. */ -#include +#include -#include -#include +#include +#include #include #include #include diff --git a/libs/binder/IPermissionController.cpp b/libs/binder/IPermissionController.cpp index 6b5dd8e6630f9..a61debf3d517a 100644 --- a/libs/binder/IPermissionController.cpp +++ b/libs/binder/IPermissionController.cpp @@ -16,11 +16,11 @@ #define LOG_TAG "PermissionController" -#include +#include #include #include -#include +#include #include #include diff --git a/libs/binder/IServiceManager.cpp b/libs/binder/IServiceManager.cpp index f2d0c27664b19..2f265b8595d61 100644 --- a/libs/binder/IServiceManager.cpp +++ b/libs/binder/IServiceManager.cpp @@ -16,12 +16,12 @@ #define LOG_TAG "ServiceManager" -#include +#include #include -#include +#include #include -#include +#include #include #include diff --git a/libs/binder/MemoryBase.cpp b/libs/binder/MemoryBase.cpp index f25e11c6ba366..033066bea3d9f 100644 --- a/libs/binder/MemoryBase.cpp +++ b/libs/binder/MemoryBase.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include namespace android { diff --git a/libs/binder/MemoryDealer.cpp b/libs/binder/MemoryDealer.cpp index cf8201b855841..fd6ab7ae88344 100644 --- a/libs/binder/MemoryDealer.cpp +++ b/libs/binder/MemoryDealer.cpp @@ -16,13 +16,13 @@ #define LOG_TAG "MemoryDealer" -#include +#include #include -#include +#include #include #include -#include +#include #include #include diff --git a/libs/binder/MemoryHeapBase.cpp b/libs/binder/MemoryHeapBase.cpp index 8251728199f8e..ac38f515dcfba 100644 --- a/libs/binder/MemoryHeapBase.cpp +++ b/libs/binder/MemoryHeapBase.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #if HAVE_ANDROID_OS #include diff --git a/libs/binder/MemoryHeapPmem.cpp b/libs/binder/MemoryHeapPmem.cpp index eba2b3055c45e..599c9aecd9140 100644 --- a/libs/binder/MemoryHeapPmem.cpp +++ b/libs/binder/MemoryHeapPmem.cpp @@ -27,8 +27,8 @@ #include -#include -#include +#include +#include #if HAVE_ANDROID_OS #include diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index cea5277d62585..d29ec8c286133 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -17,12 +17,12 @@ #define LOG_TAG "Parcel" //#define LOG_NDEBUG 0 -#include +#include -#include -#include +#include +#include #include -#include +#include #include #include #include diff --git a/libs/binder/ProcessState.cpp b/libs/binder/ProcessState.cpp index 3a99e24624e47..d7daf734279e7 100644 --- a/libs/binder/ProcessState.cpp +++ b/libs/binder/ProcessState.cpp @@ -18,14 +18,14 @@ #include -#include +#include #include -#include -#include +#include +#include #include #include -#include +#include #include #include diff --git a/libs/binder/Static.cpp b/libs/binder/Static.cpp index ff2a046e41ecc..12b0308c99f1a 100644 --- a/libs/binder/Static.cpp +++ b/libs/binder/Static.cpp @@ -19,7 +19,7 @@ #include -#include +#include #include namespace android { diff --git a/libs/surfaceflinger/GPUHardware/GPUHardware.cpp b/libs/surfaceflinger/GPUHardware/GPUHardware.cpp index 7168bf244f71e..2de628b0f1df2 100644 --- a/libs/surfaceflinger/GPUHardware/GPUHardware.cpp +++ b/libs/surfaceflinger/GPUHardware/GPUHardware.cpp @@ -30,12 +30,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/libs/surfaceflinger/LayerBitmap.cpp b/libs/surfaceflinger/LayerBitmap.cpp index e84435088a7c4..e3d0f77148ff7 100644 --- a/libs/surfaceflinger/LayerBitmap.cpp +++ b/libs/surfaceflinger/LayerBitmap.cpp @@ -23,8 +23,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/libs/surfaceflinger/LayerBuffer.cpp b/libs/surfaceflinger/LayerBuffer.cpp index 00fab70d491d0..bac544ad6e447 100644 --- a/libs/surfaceflinger/LayerBuffer.cpp +++ b/libs/surfaceflinger/LayerBuffer.cpp @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/libs/surfaceflinger/LayerBuffer.h b/libs/surfaceflinger/LayerBuffer.h index 2dc77f1501e9a..f74d6a182218d 100644 --- a/libs/surfaceflinger/LayerBuffer.h +++ b/libs/surfaceflinger/LayerBuffer.h @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include diff --git a/libs/surfaceflinger/LayerOrientationAnim.h b/libs/surfaceflinger/LayerOrientationAnim.h index 365c6aeed4d75..e86156dbc8b99 100644 --- a/libs/surfaceflinger/LayerOrientationAnim.h +++ b/libs/surfaceflinger/LayerOrientationAnim.h @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "LayerBase.h" #include "LayerBitmap.h" diff --git a/libs/surfaceflinger/LayerOrientationAnimRotate.h b/libs/surfaceflinger/LayerOrientationAnimRotate.h index 5fbbd428d6716..3296f45d46008 100644 --- a/libs/surfaceflinger/LayerOrientationAnimRotate.h +++ b/libs/surfaceflinger/LayerOrientationAnimRotate.h @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "LayerBase.h" #include "LayerBitmap.h" diff --git a/libs/surfaceflinger/SurfaceFlinger.cpp b/libs/surfaceflinger/SurfaceFlinger.cpp index 54b33ce4d6c1e..37d1deddbbe02 100644 --- a/libs/surfaceflinger/SurfaceFlinger.cpp +++ b/libs/surfaceflinger/SurfaceFlinger.cpp @@ -31,10 +31,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/libs/surfaceflinger/SurfaceFlinger.h b/libs/surfaceflinger/SurfaceFlinger.h index e02318259108e..927908d4b75ee 100644 --- a/libs/surfaceflinger/SurfaceFlinger.h +++ b/libs/surfaceflinger/SurfaceFlinger.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/libs/surfaceflinger/VRamHeap.cpp b/libs/surfaceflinger/VRamHeap.cpp index 238c602e8684a..7132d0d4bbac1 100644 --- a/libs/surfaceflinger/VRamHeap.cpp +++ b/libs/surfaceflinger/VRamHeap.cpp @@ -30,10 +30,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "GPUHardware/GPUHardware.h" #include "SurfaceFlinger.h" diff --git a/libs/surfaceflinger/VRamHeap.h b/libs/surfaceflinger/VRamHeap.h index 91401679cb2cc..780a1bc56dce8 100644 --- a/libs/surfaceflinger/VRamHeap.h +++ b/libs/surfaceflinger/VRamHeap.h @@ -19,7 +19,7 @@ #include #include -#include +#include namespace android { diff --git a/libs/surfaceflinger/tests/overlays/overlays.cpp b/libs/surfaceflinger/tests/overlays/overlays.cpp index f3c046fcee67d..0b9322e249fb9 100644 --- a/libs/surfaceflinger/tests/overlays/overlays.cpp +++ b/libs/surfaceflinger/tests/overlays/overlays.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #include #include diff --git a/libs/ui/Camera.cpp b/libs/ui/Camera.cpp index 661370040e44c..4228300067596 100644 --- a/libs/ui/Camera.cpp +++ b/libs/ui/Camera.cpp @@ -19,9 +19,9 @@ //#define LOG_NDEBUG 0 #define LOG_TAG "Camera" #include -#include +#include #include -#include +#include #include #include #include diff --git a/libs/ui/EventHub.cpp b/libs/ui/EventHub.cpp index 7c2fc8e54b1a8..52aa0c01463ce 100644 --- a/libs/ui/EventHub.cpp +++ b/libs/ui/EventHub.cpp @@ -19,7 +19,6 @@ #include #include -#include #include #include #include diff --git a/libs/ui/ICamera.cpp b/libs/ui/ICamera.cpp index ab0fef1489d64..cbe8798e7496d 100644 --- a/libs/ui/ICamera.cpp +++ b/libs/ui/ICamera.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include namespace android { diff --git a/libs/ui/ICameraService.cpp b/libs/ui/ICameraService.cpp index e5687fef68bfc..1adb4aa2cb509 100644 --- a/libs/ui/ICameraService.cpp +++ b/libs/ui/ICameraService.cpp @@ -18,9 +18,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include diff --git a/libs/ui/IOverlay.cpp b/libs/ui/IOverlay.cpp index fed47c27e9201..a20b36c51f52d 100644 --- a/libs/ui/IOverlay.cpp +++ b/libs/ui/IOverlay.cpp @@ -18,8 +18,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/libs/ui/ISurface.cpp b/libs/ui/ISurface.cpp index d5e9f812a40b1..a71cf2092d7f4 100644 --- a/libs/ui/ISurface.cpp +++ b/libs/ui/ISurface.cpp @@ -18,8 +18,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/libs/ui/ISurfaceComposer.cpp b/libs/ui/ISurfaceComposer.cpp index 76597e1712592..4b7f3a2231540 100644 --- a/libs/ui/ISurfaceComposer.cpp +++ b/libs/ui/ISurfaceComposer.cpp @@ -20,10 +20,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/libs/ui/ISurfaceFlingerClient.cpp b/libs/ui/ISurfaceFlingerClient.cpp index dd6a798b9899a..69731ab0cfd36 100644 --- a/libs/ui/ISurfaceFlingerClient.cpp +++ b/libs/ui/ISurfaceFlingerClient.cpp @@ -21,10 +21,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/libs/ui/LayerState.cpp b/libs/ui/LayerState.cpp index 0b6374b1ef41a..a53ffb7941caa 100644 --- a/libs/ui/LayerState.cpp +++ b/libs/ui/LayerState.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include namespace android { diff --git a/libs/ui/Overlay.cpp b/libs/ui/Overlay.cpp index b236edc290f58..9fae416436f7a 100644 --- a/libs/ui/Overlay.cpp +++ b/libs/ui/Overlay.cpp @@ -14,10 +14,10 @@ * limitations under the License. */ -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/libs/ui/Surface.cpp b/libs/ui/Surface.cpp index 4ea9ae2edbc0a..05cc529f817ea 100644 --- a/libs/ui/Surface.cpp +++ b/libs/ui/Surface.cpp @@ -26,8 +26,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/libs/ui/SurfaceComposerClient.cpp b/libs/ui/SurfaceComposerClient.cpp index fe803ff24964f..8acd2ee146c59 100644 --- a/libs/ui/SurfaceComposerClient.cpp +++ b/libs/ui/SurfaceComposerClient.cpp @@ -29,9 +29,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include @@ -48,7 +48,7 @@ #include -#include +#include #define VERBOSE(...) ((void)0) //#define VERBOSE LOGD diff --git a/libs/ui/SurfaceFlingerSynchro.cpp b/libs/ui/SurfaceFlingerSynchro.cpp index 5cd9755cc8a64..2e8fa12a4d610 100644 --- a/libs/ui/SurfaceFlingerSynchro.cpp +++ b/libs/ui/SurfaceFlingerSynchro.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp index 1720af0a98796..793bbf4f70fb9 100644 --- a/media/libmedia/AudioRecord.cpp +++ b/media/libmedia/AudioRecord.cpp @@ -29,11 +29,11 @@ #include #include -#include +#include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index a21a7a481b2bc..86d0542ff1738 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -18,7 +18,7 @@ //#define LOG_NDEBUG 0 #include -#include +#include #include #include diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 289bd7552cbbd..4a1b69ed85c5a 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -32,9 +32,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/media/libmedia/IAudioFlinger.cpp b/media/libmedia/IAudioFlinger.cpp index 52bd7d4ebb602..73958852e0448 100644 --- a/media/libmedia/IAudioFlinger.cpp +++ b/media/libmedia/IAudioFlinger.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include diff --git a/media/libmedia/IAudioFlingerClient.cpp b/media/libmedia/IAudioFlingerClient.cpp index 9d00aefb4ef6f..dbc2bba0ab71d 100644 --- a/media/libmedia/IAudioFlingerClient.cpp +++ b/media/libmedia/IAudioFlingerClient.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include diff --git a/media/libmedia/IAudioRecord.cpp b/media/libmedia/IAudioRecord.cpp index 6e42dac9e2a06..000a304660eb5 100644 --- a/media/libmedia/IAudioRecord.cpp +++ b/media/libmedia/IAudioRecord.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include diff --git a/media/libmedia/IAudioTrack.cpp b/media/libmedia/IAudioTrack.cpp index abc202dafb8f7..3d25a3ecba4e1 100644 --- a/media/libmedia/IAudioTrack.cpp +++ b/media/libmedia/IAudioTrack.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include diff --git a/media/libmedia/IMediaMetadataRetriever.cpp b/media/libmedia/IMediaMetadataRetriever.cpp index 85b5944484abc..dd4df99bc5a1b 100644 --- a/media/libmedia/IMediaMetadataRetriever.cpp +++ b/media/libmedia/IMediaMetadataRetriever.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include diff --git a/media/libmedia/IMediaPlayer.cpp b/media/libmedia/IMediaPlayer.cpp index f37519f42bff7..997251bdf7175 100644 --- a/media/libmedia/IMediaPlayer.cpp +++ b/media/libmedia/IMediaPlayer.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include diff --git a/media/libmedia/IMediaPlayerClient.cpp b/media/libmedia/IMediaPlayerClient.cpp index 65022cd3c0a97..d1f08bdb58527 100644 --- a/media/libmedia/IMediaPlayerClient.cpp +++ b/media/libmedia/IMediaPlayerClient.cpp @@ -16,8 +16,8 @@ */ #include -#include -#include +#include +#include #include diff --git a/media/libmedia/IMediaPlayerService.cpp b/media/libmedia/IMediaPlayerService.cpp index 370e3fbe778b8..8fd13ae57dcc1 100644 --- a/media/libmedia/IMediaPlayerService.cpp +++ b/media/libmedia/IMediaPlayerService.cpp @@ -17,9 +17,9 @@ #include #include -#include +#include -#include +#include #include #include diff --git a/media/libmedia/IMediaRecorder.cpp b/media/libmedia/IMediaRecorder.cpp index 84d08c40ac67e..dadb38a7f7c30 100644 --- a/media/libmedia/IMediaRecorder.cpp +++ b/media/libmedia/IMediaRecorder.cpp @@ -18,7 +18,7 @@ //#define LOG_NDEBUG 0 #define LOG_TAG "IMediaRecorder" #include -#include +#include #include #include #include diff --git a/media/libmedia/mediametadataretriever.cpp b/media/libmedia/mediametadataretriever.cpp index 09afc6c8798ce..d34a8ed95b0c6 100644 --- a/media/libmedia/mediametadataretriever.cpp +++ b/media/libmedia/mediametadataretriever.cpp @@ -18,8 +18,8 @@ //#define LOG_NDEBUG 0 #define LOG_TAG "MediaMetadataRetriever" -#include -#include +#include +#include #include #include #include diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp index 809316a9f7b96..0f3eb70955b45 100644 --- a/media/libmedia/mediaplayer.cpp +++ b/media/libmedia/mediaplayer.cpp @@ -24,13 +24,13 @@ #include #include -#include -#include +#include +#include #include #include -#include +#include namespace android { diff --git a/media/libmedia/mediarecorder.cpp b/media/libmedia/mediarecorder.cpp index 6b26faf736135..0a5df0db9ada9 100644 --- a/media/libmedia/mediarecorder.cpp +++ b/media/libmedia/mediarecorder.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 8ef0dc6c42c43..a17e6512fad33 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -30,10 +30,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/media/libmediaplayerservice/MediaRecorderClient.cpp b/media/libmediaplayerservice/MediaRecorderClient.cpp index e0d29474dc2f8..24f362892d2d6 100644 --- a/media/libmediaplayerservice/MediaRecorderClient.cpp +++ b/media/libmediaplayerservice/MediaRecorderClient.cpp @@ -25,10 +25,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/media/libmediaplayerservice/MetadataRetrieverClient.cpp b/media/libmediaplayerservice/MetadataRetrieverClient.cpp index 6cb4a34ead9f7..ba8d9a8eb4edc 100644 --- a/media/libmediaplayerservice/MetadataRetrieverClient.cpp +++ b/media/libmediaplayerservice/MetadataRetrieverClient.cpp @@ -26,10 +26,10 @@ #include #include -#include +#include #include -#include -#include +#include +#include #include #include #include diff --git a/media/libmediaplayerservice/MetadataRetrieverClient.h b/media/libmediaplayerservice/MetadataRetrieverClient.h index ce29c98791b4e..f31f6c050613f 100644 --- a/media/libmediaplayerservice/MetadataRetrieverClient.h +++ b/media/libmediaplayerservice/MetadataRetrieverClient.h @@ -20,7 +20,7 @@ #include #include -#include +#include #include diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp index 6954b63680c04..fbea0d44d8c9e 100644 --- a/media/mediaserver/main_mediaserver.cpp +++ b/media/mediaserver/main_mediaserver.cpp @@ -20,9 +20,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/media/sdutils/sdutil.cpp b/media/sdutils/sdutil.cpp index a9aabf03624a8..6f0cdfb2c5255 100644 --- a/media/sdutils/sdutil.cpp +++ b/media/sdutils/sdutil.cpp @@ -15,8 +15,8 @@ */ #include -#include -#include +#include +#include #include #include diff --git a/opengl/libs/EGL/gpu.cpp b/opengl/libs/EGL/gpu.cpp index f9dc5f17212e9..20d76bcd58382 100644 --- a/opengl/libs/EGL/gpu.cpp +++ b/opengl/libs/EGL/gpu.cpp @@ -29,11 +29,11 @@ #include #include -#include +#include #include -#include -#include -#include +#include +#include +#include #include #include