commit b6feabcfce080c2dc906434cf05ff606489cf39d
author Andreas Gampe <agampe@google.com> Tue Apr 21 04:01:59 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 21 04:02:00 2015 +0000
tree 73cd8e9de7fe181193c31de256ad8576bf66e65a
parent c77c14c23d5617b7e4d69dccff890f3b1b55b567
parent c917f74d9235feefd1788a7b9ba34ed8f1215850

Merge "Frameworks/base: Use better Class.forName in ZygoteInit"

media/java/android/media/MediaHTTPConnection.java

diff --git a/media/java/android/media/MediaHTTPConnection.java b/media/java/android/media/MediaHTTPConnection.java
index b2886bb..541d871 100644
--- a/media/java/android/media/MediaHTTPConnection.java
+++ b/media/java/android/media/MediaHTTPConnection.java
@@ -32,6 +32,7 @@
 import java.net.MalformedURLException;
 import java.net.NoRouteToHostException;
 import java.net.ProtocolException;
+import java.net.UnknownServiceException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -337,7 +338,10 @@
         } catch (NoRouteToHostException e) {
             Log.w(TAG, "readAt " + offset + " / " + size + " => " + e);
             return MEDIA_ERROR_UNSUPPORTED;
-        } catch (IOException e) {
+        } catch (UnknownServiceException e) {
+            Log.w(TAG, "readAt " + offset + " / " + size + " => " + e);
+            return MEDIA_ERROR_UNSUPPORTED;
+        }catch (IOException e) {
             if (VERBOSE) {
                 Log.d(TAG, "readAt " + offset + " / " + size + " => -1");
             }