From 91da6a34344f880a926867cd9548e4cd525a1a1b Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 13 Oct 2021 09:45:05 +0100
Subject: [PATCH] Fix nullness checks for UdpDataSource

PiperOrigin-RevId: 402765571
---
 .../android/exoplayer2/upstream/UdpDataSource.java    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/UdpDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/UdpDataSource.java
index df0ff1f1cc..19ea9726f1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/UdpDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/UdpDataSource.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.upstream;
 
+import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 import static java.lang.Math.min;
 
 import android.net.Uri;
@@ -63,7 +64,6 @@ public final class UdpDataSource extends BaseDataSource {
   @Nullable private DatagramSocket socket;
   @Nullable private MulticastSocket multicastSocket;
   @Nullable private InetAddress address;
-  @Nullable private InetSocketAddress socketAddress;
   private boolean opened;
 
   private int packetRemaining;
@@ -98,12 +98,12 @@ public final class UdpDataSource extends BaseDataSource {
   @Override
   public long open(DataSpec dataSpec) throws UdpDataSourceException {
     uri = dataSpec.uri;
-    String host = uri.getHost();
+    String host = checkNotNull(uri.getHost());
     int port = uri.getPort();
     transferInitializing(dataSpec);
     try {
       address = InetAddress.getByName(host);
-      socketAddress = new InetSocketAddress(address, port);
+      InetSocketAddress socketAddress = new InetSocketAddress(address, port);
       if (address.isMulticastAddress()) {
         multicastSocket = new MulticastSocket(socketAddress);
         multicastSocket.joinGroup(address);
@@ -133,7 +133,7 @@ public final class UdpDataSource extends BaseDataSource {
     if (packetRemaining == 0) {
       // We've read all of the data from the current packet. Get another.
       try {
-        socket.receive(packet);
+        checkNotNull(socket).receive(packet);
       } catch (SocketTimeoutException e) {
         throw new UdpDataSourceException(
             e, PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_TIMEOUT);
@@ -163,7 +163,7 @@ public final class UdpDataSource extends BaseDataSource {
     uri = null;
     if (multicastSocket != null) {
       try {
-        multicastSocket.leaveGroup(address);
+        multicastSocket.leaveGroup(checkNotNull(address));
       } catch (IOException e) {
         // Do nothing.
       }
@@ -174,7 +174,6 @@ public final class UdpDataSource extends BaseDataSource {
       socket = null;
     }
     address = null;
-    socketAddress = null;
     packetRemaining = 0;
     if (opened) {
       opened = false;