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

Merge "Add null checks to browser callbacks" into rvc-dev am: 31a8993720 am: 8033376766 am: d65412f3bf

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

Change-Id: I0176cd3b78987da172ce04927004a4122165b8fc
This commit is contained in:
Beth Thibodeau
2020-06-29 20:08:36 +00:00
committed by Automerger Merge Worker
parent d6e037c217 d65412f3bf
commit 0e754a1c5c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,7 +94,7 @@ public class ResumeMediaBrowser {
// a request with EXTRA_RECENT; if they don't, no resume controls // a request with EXTRA_RECENT; if they don't, no resume controls
MediaBrowser.MediaItem child = children.get(0); MediaBrowser.MediaItem child = children.get(0);
MediaDescription desc = child.getDescription(); MediaDescription desc = child.getDescription();
if (child.isPlayable()) { if (child.isPlayable() && mMediaBrowser != null) {
mCallback.addTrack(desc, mMediaBrowser.getServiceComponent(), mCallback.addTrack(desc, mMediaBrowser.getServiceComponent(),
ResumeMediaBrowser.this); ResumeMediaBrowser.this);
} else { } else {
@@ -129,7 +129,7 @@ public class ResumeMediaBrowser {
@Override @Override
public void onConnected() { public void onConnected() {
Log.d(TAG, "Service connected for " + mComponentName); Log.d(TAG, "Service connected for " + mComponentName);
if (mMediaBrowser.isConnected()) { if (mMediaBrowser != null && mMediaBrowser.isConnected()) {
String root = mMediaBrowser.getRoot(); String root = mMediaBrowser.getRoot();
if (!TextUtils.isEmpty(root)) { if (!TextUtils.isEmpty(root)) {
mCallback.onConnected(); mCallback.onConnected();
@@ -187,7 +187,7 @@ 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()) { if (mMediaBrowser == null || !mMediaBrowser.isConnected()) {
mCallback.onError(); mCallback.onError();
return; return;
} }
@@ -246,7 +246,7 @@ public class ResumeMediaBrowser {
@Override @Override
public void onConnected() { public void onConnected() {
Log.d(TAG, "connected"); Log.d(TAG, "connected");
if (!mMediaBrowser.isConnected() if (mMediaBrowser == null || !mMediaBrowser.isConnected()
|| TextUtils.isEmpty(mMediaBrowser.getRoot())) { || TextUtils.isEmpty(mMediaBrowser.getRoot())) {
mCallback.onError(); mCallback.onError();
} else { } else {