Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit babefcf5 authored by Hangyu Kuang's avatar Hangyu Kuang Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I93dc0fe99dd54f559ee104b267c62473c5bf667b
parents f6bd7f81 36da5805

media/java/android/media/MediaServiceManager.java

+2 −14
Original line number Diff line number Diff line
@@ -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);

    }



    /**