summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hangyu Kuang <hkuang@google.com> 2021-05-13 20:17:34 +0000
committer Hangyu Kuang <hkuang@google.com> 2021-05-20 20:23:01 +0000
commitdb10bbab0890a233e76c259cb60e9c02016186c2 (patch)
tree9295b5d49cecde65d7dfbc725d37b3ab03cb246a
parentf4dab5f7693b011d9b6af301861d21398b3cfa02 (diff)
Revert "trancoding: lazy-start transcoding service"
This reverts commit 0621358a526d2ede2e675a1992ce304bcdcb83b8. Reason for revert: change to conditional start. Bug: 187271658 Test: atest MediaTranscodeManagerTest; unit tests Change-Id: Iba169a3b50e37b72fab4e354480451cf05ab5be5
-rw-r--r--media/java/android/media/MediaServiceManager.java16
1 files changed, 2 insertions, 14 deletions
diff --git a/media/java/android/media/MediaServiceManager.java b/media/java/android/media/MediaServiceManager.java
index fd89c0c67e71..b899559d2e50 100644
--- a/media/java/android/media/MediaServiceManager.java
+++ b/media/java/android/media/MediaServiceManager.java
@@ -45,21 +45,12 @@ public class MediaServiceManager {
*/
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 @@ public class MediaServiceManager {
*/
@Nullable
public IBinder get() {
- if (mLazyStart) {
- return ServiceManager.waitForService(mServiceName);
- }
return ServiceManager.getService(mServiceName);
}
}
@@ -90,7 +78,7 @@ public class MediaServiceManager {
*/
@NonNull
public ServiceRegisterer getMediaTranscodingServiceRegisterer() {
- return new ServiceRegisterer(MEDIA_TRANSCODING_SERVICE, true /*lazyStart*/);
+ return new ServiceRegisterer(MEDIA_TRANSCODING_SERVICE);
}
/**