Media2HTTPConnection: remove hidden API usage, NetworkUtils.numericToInetAddress()
Test: build
Bug: 112766913
Change-Id: Id383a06460034aa51654987249119e6bff3b7dde
diff --git a/media/java/android/media/Media2HTTPConnection.java b/media/java/android/media/Media2HTTPConnection.java
index 0d7825a..a369a62 100644
--- a/media/java/android/media/Media2HTTPConnection.java
+++ b/media/java/android/media/Media2HTTPConnection.java
@@ -16,27 +16,27 @@
package android.media;
-import android.net.NetworkUtils;
+import static android.media.MediaPlayer2.MEDIA_ERROR_UNSUPPORTED;
+
import android.os.StrictMode;
import android.util.Log;
import java.io.BufferedInputStream;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.net.CookieHandler;
-import java.net.CookieManager;
-import java.net.Proxy;
-import java.net.URL;
import java.net.HttpURLConnection;
+import java.net.InetAddress;
import java.net.MalformedURLException;
import java.net.NoRouteToHostException;
import java.net.ProtocolException;
+import java.net.Proxy;
+import java.net.URL;
+import java.net.UnknownHostException;
import java.net.UnknownServiceException;
import java.util.HashMap;
import java.util.Map;
-import static android.media.MediaPlayer2.MEDIA_ERROR_UNSUPPORTED;
-
/** @hide */
public class Media2HTTPConnection {
private static final String TAG = "Media2HTTPConnection";
@@ -161,10 +161,10 @@
if (host.equalsIgnoreCase("localhost")) {
return true;
}
- if (NetworkUtils.numericToInetAddress(host).isLoopbackAddress()) {
+ if (InetAddress.getByName(host).isLoopbackAddress()) {
return true;
}
- } catch (IllegalArgumentException iex) {
+ } catch (IllegalArgumentException | UnknownHostException e) {
}
return false;
}