diff options
| author | Mark Stanford <markstanford@google.com> | 2024-01-09 21:34:34 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-01-12 23:28:37 +0000 |
| commit | 7efa00315b40699d0827e8bcc61aa6e9fd08c5d1 (patch) | |
| tree | 426f01c0da4cddcf7b3da8d302bae73aa71fc78a | |
| parent | a44f81580a01afe12851c5919a10d03c3ea94087 (diff) | |
| download | tests-7efa00315b40699d0827e8bcc61aa6e9fd08c5d1.tar.gz | |
Fix log format bug and queue node bug
Bug: 319174204
Bug: 319278923
Test: TestMediaApp; Manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d81c604bb8aa611595c77a5a769c008fc8e63a65)
Merged-In: I6fae1d05eb201fdee1b1da4068ab5ccb66f74c4f
Change-Id: I6fae1d05eb201fdee1b1da4068ab5ccb66f74c4f
3 files changed, 4 insertions, 3 deletions
diff --git a/TestMediaApp/common/res/values/strings.xml b/TestMediaApp/common/res/values/strings.xml index a4025cd..21fa2d0 100644 --- a/TestMediaApp/common/res/values/strings.xml +++ b/TestMediaApp/common/res/values/strings.xml @@ -82,7 +82,7 @@ <string name="analytics_log_output" translatable="false">Analytics event: %1$s"</string> <string name="analytics_prefs_output_title" translatable="false">Analytic events:</string> <string name="analytics_prefs_output" translatable="false"> - %1$s : %2$s ver: %3$.2f sId: %4$d com: %5$s + %1$s : %2$s ver: %3$d sId: %4$d com: %5$s </string> <string name="analytics_prefs_output_date_format" translatable="false">dd-MM-yyyy hh:mm:ss </string> diff --git a/TestMediaApp/common/src/com/android/car/media/testmediaapp/TmaPlayer.java b/TestMediaApp/common/src/com/android/car/media/testmediaapp/TmaPlayer.java index 00f39f8..45a5808 100644 --- a/TestMediaApp/common/src/com/android/car/media/testmediaapp/TmaPlayer.java +++ b/TestMediaApp/common/src/com/android/car/media/testmediaapp/TmaPlayer.java @@ -89,8 +89,8 @@ public class TmaPlayer extends MediaSessionCompat.Callback { private float mPlaybackSpeed = 1.0f; // TODO: make variable. private long mPlaybackStartTimeMs; private boolean mIsPlaying; - private List<TmaMediaItem> mQueue = Collections.emptyList(); - private List<QueueItem> mSessionQueue = Collections.emptyList(); + private List<TmaMediaItem> mQueue = Collections.synchronizedList(new ArrayList<>()); + private List<QueueItem> mSessionQueue = Collections.synchronizedList(new ArrayList<>()); private int mActiveItemIndex = -1; private int mNextEventIndex = -1; private boolean mResumeOnFocusGain; diff --git a/TestMediaApp/common/src/com/android/car/media/testmediaapp/prefs/TmaPrefsFragment.java b/TestMediaApp/common/src/com/android/car/media/testmediaapp/prefs/TmaPrefsFragment.java index ce56486..5bd690c 100644 --- a/TestMediaApp/common/src/com/android/car/media/testmediaapp/prefs/TmaPrefsFragment.java +++ b/TestMediaApp/common/src/com/android/car/media/testmediaapp/prefs/TmaPrefsFragment.java @@ -118,6 +118,7 @@ public class TmaPrefsFragment extends PreferenceFragmentCompat { analyticsEvent .stream() .map(event -> { + if(event == null) return null; long ms = event.getTimestampMillis(); return mRes.getString(R.string.analytics_prefs_output, format("dd-MM-yyyy hh:mm:ss", ms).toString(), |