Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Chong Zhang
2014-11-11 18:33:20 +00:00
committed by Android (Google) Code Review
parent 7635aab10b 8976a0954c
commit 00795e9edd
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/java/android/media/MediaHTTPConnection.java
View File

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