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

Commit 08fccd00 authored by Yao Chen's avatar Yao Chen Committed by Android (Google) Code Review
Browse files

Merge "Check the return value of bindService, and notify media browser client... 

Merge "Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false." into lmp-dev
parents 31a141af 2354c5eb

media/java/android/media/browse/MediaBrowser.java

+14 −9
Original line number Diff line number Diff line
@@ -141,11 +141,16 @@ public final class MediaBrowser { 


        final ServiceConnection thisConnection = mServiceConnection = new MediaServiceConnection();



        boolean bound = false;

        try {

            mContext.bindService(intent, mServiceConnection, Context.BIND_AUTO_CREATE);

            if (mContext.bindService(intent, mServiceConnection, Context.BIND_AUTO_CREATE)) {

                bound = true;

            }

        } catch (Exception ex) {

            Log.e(TAG, "Failed binding to service " + mServiceComponent);

        }



        if (!bound) {

            // Tell them that it didn't work.  We are already on the main thread,

            // but we don't want to do callbacks inside of connect().  So post it,

            // and then check that we are on the same ServiceConnection.  We know