diff options
| author | Mathias Agopian <mathias@google.com> | 2010-07-21 18:10:22 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2010-07-21 18:10:22 -0700 |
| commit | 50558b956157dad980441bf4fb44931ce834e36b (patch) | |
| tree | 2d208a78ab3a1c77d91751b8bbe5cafd9415f0d8 /cmds/system_server | |
| parent | c1b11b1b37d0692bd3c63575c9f2c0d9fa566602 (diff) | |
| parent | bc54e63c84a517f0dca88ba900ff2b56719f685b (diff) | |
| download | frameworks_base-50558b956157dad980441bf4fb44931ce834e36b.zip frameworks_base-50558b956157dad980441bf4fb44931ce834e36b.tar.gz frameworks_base-50558b956157dad980441bf4fb44931ce834e36b.tar.bz2 | |
resolved conflicts for merge of bc54e63c to master
Change-Id: I4245b15b4cda6963d735442c0c6a04a0477ff5e1
Diffstat (limited to 'cmds/system_server')
| -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()) { |