From 8f29a5eba9d1cd67e4eef2ef6f13d91fd8846668 Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Mon, 15 May 2023 12:33:13 +0100
Subject: [PATCH] Delete deprecated zero-arg `DefaultBandwidthMeter`
 constructor

Use `DefaultBandwidthMeter.Builder` instead.

#minor-release

PiperOrigin-RevId: 532069549
---
 RELEASENOTES.md                                    |  2 ++
 .../exoplayer/upstream/DefaultBandwidthMeter.java  | 13 -------------
 .../upstream/DefaultBandwidthMeterTest.java        | 14 ++++----------
 3 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index ac3dc63cf9..02807708b8 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -11,6 +11,8 @@
     *   Remove two deprecated `SimpleCache` constructors, use a non-deprecated
         constructor that takes a `DatabaseProvider` instead for better
         performance.
+    *   Remove `DefaultBandwidthMeter` constructor, use
+        `DefaultBandwidthMeter.Builder` instead.
 
 ### 1.1.0-alpha01 (2023-05-10)
 
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/DefaultBandwidthMeter.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/DefaultBandwidthMeter.java
index 924b9d3ac0..43a4f0f6db 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/DefaultBandwidthMeter.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/DefaultBandwidthMeter.java
@@ -297,19 +297,6 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
   private boolean networkTypeOverrideSet;
   private @C.NetworkType int networkTypeOverride;
 
-  /**
-   * @deprecated Use {@link Builder} instead.
-   */
-  @Deprecated
-  public DefaultBandwidthMeter() {
-    this(
-        /* context= */ null,
-        /* initialBitrateEstimates= */ ImmutableMap.of(),
-        DEFAULT_SLIDING_WINDOW_MAX_WEIGHT,
-        Clock.DEFAULT,
-        /* resetOnNetworkTypeChange= */ false);
-  }
-
   private DefaultBandwidthMeter(
       @Nullable Context context,
       Map<Integer, Long> initialBitrateEstimates,
diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/upstream/DefaultBandwidthMeterTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/upstream/DefaultBandwidthMeterTest.java
index bd3e3cbf1c..87aea55c92 100644
--- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/upstream/DefaultBandwidthMeterTest.java
+++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/upstream/DefaultBandwidthMeterTest.java
@@ -688,19 +688,13 @@ public final class DefaultBandwidthMeterTest {
   }
 
   @Test
-  @SuppressWarnings("deprecation")
   public void defaultInitialBitrateEstimate_withoutContext_isReasonable() {
-    DefaultBandwidthMeter bandwidthMeterWithBuilder =
+    DefaultBandwidthMeter bandwidthMeter =
         new DefaultBandwidthMeter.Builder(/* context= */ null).build();
-    long initialEstimateWithBuilder = bandwidthMeterWithBuilder.getBitrateEstimate();
+    long initialEstimate = bandwidthMeter.getBitrateEstimate();
 
-    DefaultBandwidthMeter bandwidthMeterWithoutBuilder = new DefaultBandwidthMeter();
-    long initialEstimateWithoutBuilder = bandwidthMeterWithoutBuilder.getBitrateEstimate();
-
-    assertThat(initialEstimateWithBuilder).isGreaterThan(100_000L);
-    assertThat(initialEstimateWithBuilder).isLessThan(50_000_000L);
-    assertThat(initialEstimateWithoutBuilder).isGreaterThan(100_000L);
-    assertThat(initialEstimateWithoutBuilder).isLessThan(50_000_000L);
+    assertThat(initialEstimate).isGreaterThan(100_000L);
+    assertThat(initialEstimate).isLessThan(50_000_000L);
   }
 
   private void setActiveNetworkInfo(NetworkInfo networkInfo) {