sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove Guava @Beta API warning suppressions

Browse source 
These are no longer needed now we've updated to 32.1.3 in 7a10435633

PiperOrigin-RevId: 579149808
This commit is contained in:
ibaker 2023-11-03 05:17:28 -07:00 committed by Copybara-Service
parent 21a9bfe440
commit 0a016b59f7
2 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/common/src/main/java/androidx/media3/common/util/Util.java
View file

@ -1688,8 +1688,6 @@ public final class Util {
// LongMath.saturatedMultiply is @Beta in the version of Guava we currently depend on (31.1) // LongMath.saturatedMultiply is @Beta in the version of Guava we currently depend on (31.1)
// but it is no longer @Beta from 32.0.0. This suppression is therefore safe because there's // but it is no longer @Beta from 32.0.0. This suppression is therefore safe because there's
// no version of Guava after 31.1 that doesn't contain this symbol. // no version of Guava after 31.1 that doesn't contain this symbol.
// TODO(b/290045069): Remove this suppression when we depend on Guava 32+.
@SuppressWarnings("UnstableApiUsage")
@UnstableApi @UnstableApi
public static long scaleLargeValue( public static long scaleLargeValue(
long value, long multiplier, long divisor, RoundingMode roundingMode) { long value, long multiplier, long divisor, RoundingMode roundingMode) {
@ -1725,8 +1723,6 @@ public final class Util {
// LongMath.saturatedMultiply is @Beta in the version of Guava we currently depend on (31.1) // LongMath.saturatedMultiply is @Beta in the version of Guava we currently depend on (31.1)
// but it is no longer @Beta from 32.0.0. This suppression is therefore safe because there's // but it is no longer @Beta from 32.0.0. This suppression is therefore safe because there's
// no version of Guava after 31.1 that doesn't contain this symbol. // no version of Guava after 31.1 that doesn't contain this symbol.
// TODO(b/290045069): Remove this suppression when we depend on Guava 32+.
@SuppressWarnings("UnstableApiUsage")
@UnstableApi @UnstableApi
public static long[] scaleLargeValues( public static long[] scaleLargeValues(
List<Long> values, long multiplier, long divisor, RoundingMode roundingMode) { List<Long> values, long multiplier, long divisor, RoundingMode roundingMode) {
@ -1829,8 +1825,6 @@ public final class Util {
// LongMath.saturatedMultiply is @Beta in the version of Guava we currently depend on (31.1) // LongMath.saturatedMultiply is @Beta in the version of Guava we currently depend on (31.1)
// but it is no longer @Beta from 32.0.0. This suppression is therefore safe because there's // but it is no longer @Beta from 32.0.0. This suppression is therefore safe because there's
// no version of Guava after 31.1 that doesn't contain this symbol. // no version of Guava after 31.1 that doesn't contain this symbol.
// TODO(b/290045069): Remove this suppression when we depend on Guava 32+.
@SuppressWarnings("UnstableApiUsage")
private static long scaleLargeValueFallback( private static long scaleLargeValueFallback(
long value, long multiplier, long divisor, RoundingMode roundingMode) { long value, long multiplier, long divisor, RoundingMode roundingMode) {
long numerator = LongMath.saturatedMultiply(value, multiplier); long numerator = LongMath.saturatedMultiply(value, multiplier);

4
libraries/common/src/test/java/androidx/media3/common/util/UtilScaleLargeValueParameterizedTest.java
View file

@ -272,8 +272,6 @@ public class UtilScaleLargeValueParameterizedTest {
* floating-point branch (which will cause this test to fail because passing * floating-point branch (which will cause this test to fail because passing
* RoundingMode.UNNECESSARY won't be allowed). * RoundingMode.UNNECESSARY won't be allowed).
*/ */
// TODO(b/290045069): Remove this suppression when we depend on Guava 32+.
@SuppressWarnings("UnstableApiUsage")
@Test @Test
public void cancelsRatherThanFallThroughToFloatingPoint() { public void cancelsRatherThanFallThroughToFloatingPoint() {
long value = 24960; long value = 24960;
@ -288,8 +286,6 @@ public class UtilScaleLargeValueParameterizedTest {
assertThat(result).isEqualTo(520000); assertThat(result).isEqualTo(520000);
} }
// TODO(b/290045069): Remove this suppression when we depend on Guava 32+.
@SuppressWarnings("UnstableApiUsage")
@Test @Test
public void numeratorOverflowsAndCantBeCancelled() { public void numeratorOverflowsAndCantBeCancelled() {
// Use three Mersenne primes so nothing can cancel, and the numerator will (just) overflow 64 // Use three Mersenne primes so nothing can cancel, and the numerator will (just) overflow 64