Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f21a6499 authored by Shubang Lu's avatar Shubang Lu Committed by Automerger Merge Worker
Browse files

Merge "Change default value from NONE to UNKNOWN" into sc-dev am: 8e31f85e 

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

Change-Id: I5e913f8faadde81d73656e584e53083057004fda
parents 9c1d1a05 8e31f85e

media/java/android/media/metrics/PlaybackErrorEvent.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -317,7 +317,7 @@ public final class PlaybackErrorEvent extends Event implements Parcelable { 
     */

     */

    public static final class Builder {

    public static final class Builder {

        private @Nullable Exception mException;

        private @Nullable Exception mException;

        private int mErrorCode;

        private int mErrorCode = ERROR_UNKNOWN;

        private int mSubErrorCode;

        private int mSubErrorCode;

        private long mTimeSinceCreatedMillis = -1;

        private long mTimeSinceCreatedMillis = -1;

        private Bundle mMetricsBundle = new Bundle();

        private Bundle mMetricsBundle = new Bundle();

media/java/android/media/metrics/PlaybackMetrics.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -502,9 +502,9 @@ public final class PlaybackMetrics implements Parcelable { 
        private long mMediaDurationMillis = -1;

        private long mMediaDurationMillis = -1;

        private int mStreamSource = STREAM_SOURCE_UNKNOWN;

        private int mStreamSource = STREAM_SOURCE_UNKNOWN;

        private int mStreamType = STREAM_TYPE_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 mDrmType = DRM_TYPE_NONE;

        private int mContentType = CONTENT_TYPE_OTHER;

        private int mContentType = CONTENT_TYPE_UNKNOWN;

        private @Nullable String mPlayerName;

        private @Nullable String mPlayerName;

        private @Nullable String mPlayerVersion;

        private @Nullable String mPlayerVersion;

        private @NonNull List<Long> mExperimentIds = new ArrayList<>();

        private @NonNull List<Long> mExperimentIds = new ArrayList<>();