Merge "Add null checks to browser callbacks" into rvc-dev (31a89937) · Commits · e / os / android_frameworks_base

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

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -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 {