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

Commit 8e31f85e authored by Shubang Lu's avatar Shubang Lu Committed by Android (Google) Code Review
Browse files

Merge "Change default value from NONE to UNKNOWN" into sc-dev

parents 0e3d3b90 d7b1d8e6

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

+1 −1
Original line number Diff line number Diff line
@@ -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();

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

+2 −2
Original line number Diff line number Diff line
@@ -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<Long> mExperimentIds = new ArrayList<>();