diff options
| author | Yabin Huang <yabinh@google.com> | 2019-06-18 15:18:56 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-18 15:18:56 -0700 |
| commit | fa8821f46b6b3d8fc086497b3e6c7687078caf29 (patch) | |
| tree | ef1029099bbeae73b8daa7778ce262a77386ba9b | |
| parent | 50e659ff6949ab31d8f34011073a4f22c399d3a2 (diff) | |
| parent | 5fb9d469929a33236a4dfbdab78617b5f799445b (diff) | |
| download | Media-fa8821f46b6b3d8fc086497b3e6c7687078caf29.tar.gz | |
Merge "Handle playback error properly where the error message is empty" into pi-car-dev
am: 5fb9d46992
Change-Id: I20807b97812672824c7e32ff8e65bcdd609a7379
| -rw-r--r-- | src/com/android/car/media/MediaActivity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/car/media/MediaActivity.java b/src/com/android/car/media/MediaActivity.java index 1160ad2d..942c2d67 100644 --- a/src/com/android/car/media/MediaActivity.java +++ b/src/com/android/car/media/MediaActivity.java @@ -313,10 +313,10 @@ public class MediaActivity extends FragmentActivity implements BrowseFragment.Ca MediaConstants.ERROR_RESOLUTION_ACTION_LABEL); String displayedMessage = null; - if (state.getErrorMessage() != null) { + if (!TextUtils.isEmpty(state.getErrorMessage())) { displayedMessage = state.getErrorMessage().toString(); } else if (state.getErrorCode() != PlaybackStateCompat.ERROR_CODE_UNKNOWN_ERROR) { - // TODO: convert the error codes to prebuilt error messages + // TODO(b/131601881): convert the error codes to prebuilt error messages displayedMessage = getString(R.string.default_error_message); } else if (state.getState() == PlaybackStateCompat.STATE_ERROR) { displayedMessage = getString(R.string.default_error_message); |