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

Commit 510ef40b authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Automerger Merge Worker
Browse files

Merge "Check connection state of media browser" into rvc-dev am: e4c1cb51... 

Merge "Check connection state of media browser" into rvc-dev am: e4c1cb51 am: 9bad9d72 am: 258d9864

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

Change-Id: I7036fa3f769ee7ca4471d4f27cc360055a5f27fb
parents b125643c 258d9864

packages/SystemUI/src/com/android/systemui/media/ResumeMediaBrowser.java

+13 −4
Original line number Original line Diff line number Diff line
@@ -135,13 +135,17 @@ public class ResumeMediaBrowser { 
         */

         */

        @Override

        @Override

        public void onConnected() {

        public void onConnected() {

            if (mMediaBrowser.isConnected()) {

                mCallback.onConnected();

            Log.d(TAG, "Service connected for " + mComponentName);

            Log.d(TAG, "Service connected for " + mComponentName);

            if (mMediaBrowser.isConnected()) {

                String root = mMediaBrowser.getRoot();

                String root = mMediaBrowser.getRoot();

                if (!TextUtils.isEmpty(root)) {

                    mCallback.onConnected();

                    mMediaBrowser.subscribe(root, mSubscriptionCallback);

                    mMediaBrowser.subscribe(root, mSubscriptionCallback);

                    return;

                }

                }

            }

            }

            mCallback.onError();

        }





        /**

        /**

         * Invoked when the client is disconnected from the media browser.

         * Invoked when the client is disconnected from the media browser.
@@ -193,6 +197,10 @@ public class ResumeMediaBrowser { 
                    @Override

                    @Override

                    public void onConnected() {

                    public void onConnected() {

                        Log.d(TAG, "Connected for restart " + mMediaBrowser.isConnected());

                        Log.d(TAG, "Connected for restart " + mMediaBrowser.isConnected());

                        if (!mMediaBrowser.isConnected()) {

                            mCallback.onError();

                            return;

                        }

                        MediaSession.Token token = mMediaBrowser.getSessionToken();

                        MediaSession.Token token = mMediaBrowser.getSessionToken();

                        MediaController controller = new MediaController(mContext, token);

                        MediaController controller = new MediaController(mContext, token);

                        controller.getTransportControls();

                        controller.getTransportControls();
@@ -251,7 +259,8 @@ public class ResumeMediaBrowser { 
                    @Override

                    @Override

                    public void onConnected() {

                    public void onConnected() {

                        Log.d(TAG, "connected");

                        Log.d(TAG, "connected");

                        if (TextUtils.isEmpty(mMediaBrowser.getRoot())) {

                        if (!mMediaBrowser.isConnected()

                                || TextUtils.isEmpty(mMediaBrowser.getRoot())) {

                            mCallback.onError();

                            mCallback.onError();

                        } else {

                        } else {

                            mCallback.onConnected();

                            mCallback.onConnected();