diff options
| author | Mathias Agopian <mathias@google.com> | 2010-07-21 16:06:46 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-21 16:06:46 -0700 |
| commit | e4764521353e898554931a557460fc49209fb0a9 (patch) | |
| tree | 261afe438ecda0a438afe04c8a5e1c40bf978d63 /cmds | |
| parent | 3685db7f5dd8a830a4e096404d4924e12697fb78 (diff) | |
| parent | 1bf797857e025e8a71db86fb9e79765a767ec1eb (diff) | |
| download | frameworks_base-e4764521353e898554931a557460fc49209fb0a9.zip frameworks_base-e4764521353e898554931a557460fc49209fb0a9.tar.gz frameworks_base-e4764521353e898554931a557460fc49209fb0a9.tar.bz2 | |
Merge "new SensorService" into gingerbread
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/system_server/library/Android.mk | 2 | ||||
| -rw-r--r-- | cmds/system_server/library/system_init.cpp | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/cmds/system_server/library/Android.mk b/cmds/system_server/library/Android.mk index a880a91..457cbd4 100644 --- a/cmds/system_server/library/Android.mk +++ b/cmds/system_server/library/Android.mk @@ -10,11 +10,13 @@ LOCAL_C_INCLUDES := \ $(base)/services/camera/libcameraservice \ $(base)/services/audioflinger \ $(base)/services/surfaceflinger \ + $(base)/services/sensorservice \ $(base)/media/libmediaplayerservice \ $(JNI_H_INCLUDE) LOCAL_SHARED_LIBRARIES := \ libandroid_runtime \ + libsensorservice \ libsurfaceflinger \ libaudioflinger \ libcameraservice \ diff --git a/cmds/system_server/library/system_init.cpp b/cmds/system_server/library/system_init.cpp index 1d57fdc..a29ba73 100644 --- a/cmds/system_server/library/system_init.cpp +++ b/cmds/system_server/library/system_init.cpp @@ -19,6 +19,7 @@ #include <CameraService.h> #include <AudioPolicyService.h> #include <MediaPlayerService.h> +#include <SensorService.h> #include <android_runtime/AndroidRuntime.h> @@ -69,6 +70,9 @@ extern "C" status_t system_init() SurfaceFlinger::instantiate(); } + // Start the sensor service + SensorService::instantiate(); + // On the simulator, audioflinger et al don't get started the // same way as on the device, and we need to start them here if (!proc->supportsProcesses()) { |