From d7b1d8e6a0b839ef3106d716b93d6eacbb839cc4 Mon Sep 17 00:00:00 2001 From: shubang Date: Fri, 23 Jul 2021 13:48:47 -0700 Subject: [PATCH] Change default value from NONE to UNKNOWN Bug: 194523273 Test: atest MediaMetricsAtomTests Change-Id: Ib5b96db02089f3b785507c7f5fd822bcb68f35ea --- media/java/android/media/metrics/PlaybackErrorEvent.java | 2 +- media/java/android/media/metrics/PlaybackMetrics.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/media/java/android/media/metrics/PlaybackErrorEvent.java b/media/java/android/media/metrics/PlaybackErrorEvent.java index 184b35913783d..4e3b426c06301 100644 --- a/media/java/android/media/metrics/PlaybackErrorEvent.java +++ b/media/java/android/media/metrics/PlaybackErrorEvent.java @@ -317,7 +317,7 @@ public final class PlaybackErrorEvent extends Event implements Parcelable { */ public static final class Builder { private @Nullable Exception mException; - private int mErrorCode; + private int mErrorCode = ERROR_UNKNOWN; private int mSubErrorCode; private long mTimeSinceCreatedMillis = -1; private Bundle mMetricsBundle = new Bundle(); diff --git a/media/java/android/media/metrics/PlaybackMetrics.java b/media/java/android/media/metrics/PlaybackMetrics.java index bbcc48480e689..e71ee204f5645 100644 --- a/media/java/android/media/metrics/PlaybackMetrics.java +++ b/media/java/android/media/metrics/PlaybackMetrics.java @@ -502,9 +502,9 @@ public final class PlaybackMetrics implements Parcelable { private long mMediaDurationMillis = -1; private int mStreamSource = STREAM_SOURCE_UNKNOWN; private int mStreamType = STREAM_TYPE_UNKNOWN; - private int mPlaybackType = PLAYBACK_TYPE_OTHER; + private int mPlaybackType = PLAYBACK_TYPE_UNKNOWN; private int mDrmType = DRM_TYPE_NONE; - private int mContentType = CONTENT_TYPE_OTHER; + private int mContentType = CONTENT_TYPE_UNKNOWN; private @Nullable String mPlayerName; private @Nullable String mPlayerVersion; private @NonNull List mExperimentIds = new ArrayList<>();