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

Commit ddec9db6 authored by Jaewan Kim's avatar Jaewan Kim
Browse files

MediaSession2: Rename BrowserRoot to LibraryRoot and move to updatable 

Renaming was the one of the feedback from ag/3506231

Test: Run all MediaComponents tests once
Change-Id: I156116f11a64a04cc82f7c360969808ca64f85b2
parent 8a501874

packages/MediaComponents/src/com/android/media/MediaBrowser2Impl.java

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public class MediaBrowser2Impl extends MediaController2Impl implements MediaBrow 
    }



    @Override

    public void getBrowserRoot_impl(Bundle rootHints) {

    public void getLibraryRoot_impl(Bundle rootHints) {

        final IMediaSession2 binder = getSessionBinder();

        if (binder != null) {

            try {

packages/MediaComponents/src/com/android/media/MediaLibraryService2Impl.java

+32 −4
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.media; 
import android.app.PendingIntent;

import android.content.Context;

import android.media.MediaLibraryService2;

import android.media.MediaLibraryService2.LibraryRoot;

import android.media.MediaLibraryService2.MediaLibrarySession;

import android.media.MediaLibraryService2.MediaLibrarySessionBuilder;

import android.media.MediaLibraryService2.MediaLibrarySessionCallback;
@@ -112,4 +113,31 @@ public class MediaLibraryService2Impl extends MediaSessionService2Impl implement 
                    mSessionActivity, mCallbackExecutor, mCallback).getInstance();

        }

    }



    public static final class LibraryRootImpl implements LibraryRootProvider {

        private final LibraryRoot mInstance;

        private final String mRootId;

        private final Bundle mExtras;



        public LibraryRootImpl(Context context, LibraryRoot instance, String rootId,

                Bundle extras) {

            if (rootId == null) {

                throw new IllegalArgumentException("The root id in BrowserRoot cannot be null. " +

                        "Use null for BrowserRoot instead.");

            }

            mInstance = instance;

            mRootId = rootId;

            mExtras = extras;

        }



        @Override

        public String getRootId_impl() {

            return mRootId;

        }



        @Override

        public Bundle getExtras_impl() {

            return mExtras;

        }

    }

}
 
 No newline at end of file

packages/MediaComponents/src/com/android/media/MediaSession2Stub.java

+3 −3
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.media; 


import android.content.Context;

import android.media.MediaItem2;

import android.media.MediaLibraryService2.BrowserRoot;

import android.media.MediaLibraryService2.LibraryRoot;

import android.media.MediaLibraryService2.MediaLibrarySessionCallback;

import android.media.MediaSession2;

import android.media.MediaSession2.Command;
@@ -263,7 +263,7 @@ public class MediaSession2Stub extends IMediaSession2.Stub { 
        final MediaSession2Impl sessionImpl = getSession();

        if (!(sessionImpl.getCallback() instanceof MediaLibrarySessionCallback)) {

            if (DEBUG) {

                Log.d(TAG, "Session cannot hand getBrowserRoot()");

                Log.d(TAG, "Session cannot hand getLibraryRoot()");

            }

            return;

        }
@@ -282,7 +282,7 @@ public class MediaSession2Stub extends IMediaSession2.Stub { 
            final MediaLibrarySessionCallback libraryCallback =

                    (MediaLibrarySessionCallback) session.getCallback();

            final ControllerInfoImpl controllerImpl = ControllerInfoImpl.from(controller);

            BrowserRoot root = libraryCallback.onGetRoot(controller, rootHints);

            LibraryRoot root = libraryCallback.onGetRoot(controller, rootHints);

            try {

                controllerImpl.getControllerBinder().onGetRootResult(rootHints,

                        root == null ? null : root.getRootId(),

packages/MediaComponents/src/com/android/media/update/ApiFactory.java

+9 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.media.MediaController2; 
import android.media.MediaController2.ControllerCallback;

import android.media.MediaItem2;

import android.media.MediaLibraryService2;

import android.media.MediaLibraryService2.LibraryRoot;

import android.media.MediaLibraryService2.MediaLibrarySession;

import android.media.MediaLibraryService2.MediaLibrarySessionBuilder;

import android.media.MediaLibraryService2.MediaLibrarySessionCallback;
@@ -50,6 +51,7 @@ import android.media.update.MediaBrowser2Provider; 
import android.media.update.MediaControlView2Provider;

import android.media.update.MediaController2Provider;

import android.media.update.MediaItem2Provider;

import android.media.update.MediaLibraryService2Provider.LibraryRootProvider;

import android.media.update.MediaMetadata2Provider;

import android.media.update.MediaSession2Provider;

import android.media.update.MediaSession2Provider.BuilderBaseProvider;
@@ -76,6 +78,7 @@ import com.android.media.MediaBrowser2Impl; 
import com.android.media.MediaController2Impl;

import com.android.media.MediaItem2Impl;

import com.android.media.MediaLibraryService2Impl;

import com.android.media.MediaLibraryService2Impl.LibraryRootImpl;

import com.android.media.MediaMetadata2Impl;

import com.android.media.MediaSession2Impl;

import com.android.media.MediaSession2Impl.PlaylistParamsImpl;
@@ -195,6 +198,12 @@ public class ApiFactory implements StaticProvider { 
                callback);

    }



    @Override

    public LibraryRootProvider createMediaLibraryService2LibraryRoot(Context context,

            LibraryRoot instance, String rootId, Bundle extras) {

        return new LibraryRootImpl(context, instance, rootId, extras);

    }



    @Override

    public MediaControlView2Provider createMediaControlView2(

            MediaControlView2 instance, ViewProvider superProvider) {

packages/MediaComponents/test/src/android/media/MediaBrowser2Test.java

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ public class MediaBrowser2Test extends MediaController2Test { 
    }



    @Test

    public void testGetBrowserRoot() throws InterruptedException {

    public void testGetLibraryRoot() throws InterruptedException {

        final Bundle param = new Bundle();

        param.putString(TAG, TAG);
@@ -84,7 +84,7 @@ public class MediaBrowser2Test extends MediaController2Test { 
        final SessionToken2 token = MockMediaLibraryService2.getToken(mContext);

        MediaBrowser2 browser =

                (MediaBrowser2) createController(token,true, callback);

        browser.getBrowserRoot(param);

        browser.getLibraryRoot(param);

        assertTrue(latch.await(WAIT_TIME_MS, TimeUnit.MILLISECONDS));

    }