Revert "mediaserver: wait before instantiating services"

This reverts commit 91101bd5d7b3be0131e5f1a288992fee9fd1db2b.

1 files changed, 0 insertions, 20 deletions

diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp
index f16e0d9..7094cfa 100644
--- a/media/mediaserver/main_mediaserver.cpp
+++ b/media/mediaserver/main_mediaserver.cpp
@@ -33,34 +33,14 @@
 
 using namespace android;
 
-int waitBeforeAdding( const String16& serviceName ) {
-    sp<IServiceManager> sm = defaultServiceManager();
-    for ( int i = 0 ; i < 5; i++ ) {
-        if ( sm->checkService ( serviceName ) != NULL ) {
-            sleep(1);
-        }
-        else {
-            //good to go;
-            return 0;
-        }
-    }
-    LOGE("waitBeforeAdding (%s) timed out",
-         String8(serviceName.string()).string());
-    return -1;
-}
-
 int main(int argc, char** argv)
 {
     sp<ProcessState> proc(ProcessState::self());
     sp<IServiceManager> sm = defaultServiceManager();
     LOGI("ServiceManager: %p", sm.get());
-    waitBeforeAdding( String16("media.audio_flinger") );
     AudioFlinger::instantiate();
-    waitBeforeAdding( String16("media.player") );
     MediaPlayerService::instantiate();
-    waitBeforeAdding( String16("media.camera") );
     CameraService::instantiate();
-    waitBeforeAdding( String16("media.audio_policy") );
     AudioPolicyService::instantiate();
     ProcessState::self()->startThreadPool();
     IPCThreadState::self()->joinThreadPool();