commit 60998a59e0b7ef65bf25f04ec81b007c4779c6aa
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 05 10:59:05 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 05 10:59:05 2019 +0000
tree bced28c61cef5e4d7b5a617295ce8ef992823fde
parent 55805af7195bd2c433a1dccb1a9cd300167423a1
parent 215d24af93719a5691b1898f7ebaee4b4976c098

Merge "Make MediaItem2 builder be a final class"

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 0176b9b..3ba0dd2 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -25137,7 +25137,7 @@
     field public static final long POSITION_UNKNOWN = 576460752303423487L; // 0x7ffffffffffffffL
   }
 
-  public static class MediaItem2.Builder {
+  public static final class MediaItem2.Builder {
     ctor public MediaItem2.Builder();
     method @NonNull public android.media.MediaItem2 build();
     method @NonNull public android.media.MediaItem2.Builder setEndPosition(long);

media/apex/java/android/media/MediaItem2.java

diff --git a/media/apex/java/android/media/MediaItem2.java b/media/apex/java/android/media/MediaItem2.java
index fc0f08e..ff0d43e 100644
--- a/media/apex/java/android/media/MediaItem2.java
+++ b/media/apex/java/android/media/MediaItem2.java
@@ -245,7 +245,7 @@
     /**
      * Builder for {@link MediaItem2}.
      */
-    public static class Builder {
+    public static final class Builder {
         @SuppressWarnings("WeakerAccess") /* synthetic access */
         MediaMetadata mMetadata;
         @SuppressWarnings("WeakerAccess") /* synthetic access */