Merge "Revert "trancoding: lazy-start transcoding service"" into sc-dev
diff --git a/media/java/android/media/MediaServiceManager.java b/media/java/android/media/MediaServiceManager.java
index fd89c0c..b899559 100644
--- a/media/java/android/media/MediaServiceManager.java
+++ b/media/java/android/media/MediaServiceManager.java
@@ -45,21 +45,12 @@
*/
public static final class ServiceRegisterer {
private final String mServiceName;
- private final boolean mLazyStart;
-
- /**
- * @hide
- */
- public ServiceRegisterer(String serviceName, boolean lazyStart) {
- mServiceName = serviceName;
- mLazyStart = lazyStart;
- }
/**
* @hide
*/
public ServiceRegisterer(String serviceName) {
- this(serviceName, false /*lazyStart*/);
+ mServiceName = serviceName;
}
/**
@@ -70,9 +61,6 @@
*/
@Nullable
public IBinder get() {
- if (mLazyStart) {
- return ServiceManager.waitForService(mServiceName);
- }
return ServiceManager.getService(mServiceName);
}
}
@@ -90,7 +78,7 @@
*/
@NonNull
public ServiceRegisterer getMediaTranscodingServiceRegisterer() {
- return new ServiceRegisterer(MEDIA_TRANSCODING_SERVICE, true /*lazyStart*/);
+ return new ServiceRegisterer(MEDIA_TRANSCODING_SERVICE);
}
/**