commit 00795e9edda7038022d8f1268ca3304165076d2e
author Chong Zhang <chz@google.com> Tue Nov 11 18:33:20 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 11 18:33:21 2014 +0000
tree dd3e83e1ce2ad71124b1ae589f799a90d1eeee45
parent 7635aab10b44773d599ef8229a967fdf99d2817a
parent 8976a0954cce9cfc8bd8776893fc9067e240a91c

Merge "return error MEDIA_ERROR_UNSUPPORTED when Range request fail" into lmp-mr1-dev

media/java/android/media/MediaHTTPConnection.java

diff --git a/media/java/android/media/MediaHTTPConnection.java b/media/java/android/media/MediaHTTPConnection.java
index d0f3334..b2886bb 100644
--- a/media/java/android/media/MediaHTTPConnection.java
+++ b/media/java/android/media/MediaHTTPConnection.java
@@ -31,6 +31,7 @@
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.NoRouteToHostException;
+import java.net.ProtocolException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -282,7 +283,7 @@
             if (offset > 0 && response != HttpURLConnection.HTTP_PARTIAL) {
                 // Some servers simply ignore "Range" requests and serve
                 // data from the start of the content.
-                throw new IOException();
+                throw new ProtocolException();
             }
 
             mInputStream =
@@ -330,6 +331,9 @@
             }
 
             return n;
+        } catch (ProtocolException e) {
+            Log.w(TAG, "readAt " + offset + " / " + size + " => " + e);
+            return MEDIA_ERROR_UNSUPPORTED;
         } catch (NoRouteToHostException e) {
             Log.w(TAG, "readAt " + offset + " / " + size + " => " + e);
             return MEDIA_ERROR_UNSUPPORTED;