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

Merge "Merge "Check connection state of media browser" into rvc-dev am: e4c1cb514c am: 9bad9d721c" into rvc-d1-dev-plus-aosp

Browse Source
This commit is contained in:
Automerger Merge Worker
2020-06-12 20:20:32 +00:00
committed by Android (Google) Code Review
parent 29905ae301 ec508211f4
commit c4be728798
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,12 +135,16 @@ public class ResumeMediaBrowser {
*/
@Override
public void onConnected() {
Log.d(TAG, "Service connected for " + mComponentName);
if (mMediaBrowser.isConnected()) {
mCallback.onConnected();
Log.d(TAG, "Service connected for " + mComponentName);
String root = mMediaBrowser.getRoot();
mMediaBrowser.subscribe(root, mSubscriptionCallback);
if (!TextUtils.isEmpty(root)) {
mCallback.onConnected();
mMediaBrowser.subscribe(root, mSubscriptionCallback);
return;
}
}
mCallback.onError();
}
/**
@@ -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();