Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "trancoding: lazy-start transcoding service"" into sc-dev am: 36da5805e5

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14534458

Change-Id: I93dc0fe99dd54f559ee104b267c62473c5bf667b
This commit is contained in:
Hangyu Kuang
2021-05-21 16:31:34 +00:00
committed by Automerger Merge Worker
parent f6bd7f81ea 36da5805e5
commit babefcf59f
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
media/java/android/media/MediaServiceManager.java
View File

@@ -45,21 +45,12 @@ public class MediaServiceManager {
*/ */
public static final class ServiceRegisterer { public static final class ServiceRegisterer {
private final String mServiceName; private final String mServiceName;
private final boolean mLazyStart;
/**
* @hide
*/
public ServiceRegisterer(String serviceName, boolean lazyStart) {
mServiceName = serviceName;
mLazyStart = lazyStart;
}
/** /**
* @hide * @hide
*/ */
public ServiceRegisterer(String serviceName) { public ServiceRegisterer(String serviceName) {
this(serviceName, false /*lazyStart*/); mServiceName = serviceName;
} }
/** /**
@@ -70,9 +61,6 @@ public class MediaServiceManager {
*/ */
@Nullable @Nullable
public IBinder get() { public IBinder get() {
if (mLazyStart) {
return ServiceManager.waitForService(mServiceName);
}
return ServiceManager.getService(mServiceName); return ServiceManager.getService(mServiceName);
} }
} }
@@ -90,7 +78,7 @@ public class MediaServiceManager {
*/ */
@NonNull @NonNull
public ServiceRegisterer getMediaTranscodingServiceRegisterer() { public ServiceRegisterer getMediaTranscodingServiceRegisterer() {
return new ServiceRegisterer(MEDIA_TRANSCODING_SERVICE, true /*lazyStart*/); return new ServiceRegisterer(MEDIA_TRANSCODING_SERVICE);
} }
/** /**