Merge "Check connection state of media browser" into rvc-dev (e4c1cb51) · Commits · e / os / android_frameworks_base

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

+13 −4

Original line number	Diff line number	Diff line
		@@ -135,13 +135,17 @@ public class ResumeMediaBrowser {
		*/
		@Override
		public void onConnected() {
		if (mMediaBrowser.isConnected()) {
		mCallback.onConnected();
		Log.d(TAG, "Service connected for " + mComponentName);
		if (mMediaBrowser.isConnected()) {
		String root = mMediaBrowser.getRoot();
		if (!TextUtils.isEmpty(root)) {
		mCallback.onConnected();
		mMediaBrowser.subscribe(root, mSubscriptionCallback);
		return;
		}
		}
		mCallback.onError();
		}

		/**
		* Invoked when the client is disconnected from the media browser.
		@@ -193,6 +197,10 @@ public class ResumeMediaBrowser {
		@Override
		public void onConnected() {
		Log.d(TAG, "Connected for restart " + mMediaBrowser.isConnected());
		if (!mMediaBrowser.isConnected()) {
		mCallback.onError();
		return;
		}
		MediaSession.Token token = mMediaBrowser.getSessionToken();
		MediaController controller = new MediaController(mContext, token);
		controller.getTransportControls();
		@@ -251,7 +259,8 @@ public class ResumeMediaBrowser {
		@Override
		public void onConnected() {
		Log.d(TAG, "connected");
		if (TextUtils.isEmpty(mMediaBrowser.getRoot())) {
		if (!mMediaBrowser.isConnected()
		\|\| TextUtils.isEmpty(mMediaBrowser.getRoot())) {
		mCallback.onError();
		} else {
		mCallback.onConnected();