Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ie2b18c8046f5e35ca1aa78c90285d9cda16a7fe5
This commit is contained in:
Beth Thibodeau
2020-06-12 20:09:09 +00:00
committed by Automerger Merge Worker
parent 500c995906 e4c1cb514c
commit 5b7cf019ef
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/src/com/android/systemui/media/ResumeMediaBrowser.java
View File

@@ -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();