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

am 4531e9c4: Merge "Add method to get redirected Uri"

Browse Source 
* commit '4531e9c45cc42c21f6033e52824453b18146a2c0':
  Add method to get redirected Uri
This commit is contained in:
Marco Nelissen
2014-02-24 09:17:03 -08:00
committed by Android Git Automerger
parent 7fa375333f 4531e9c45c
commit bf9c92d0f2
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
media/java/android/media/IMediaHTTPConnection.aidl
View File

@@ -29,5 +29,6 @@ interface IMediaHTTPConnection
int readAt(long offset, int size);
long getSize();
String getMIMEType();
String getUri();
}

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

@@ -16,7 +16,6 @@
package android.media;
import android.net.Uri;
import android.os.IBinder;
import android.os.StrictMode;
import android.util.Log;
@@ -52,6 +51,7 @@ public class MediaHTTPConnection extends IMediaHTTPConnection.Stub {
native_setup();
}
@Override
public IBinder connect(String uri, String headers) {
if (VERBOSE) {
Log.d(TAG, "connect: uri=" + uri + ", headers=" + headers);
@@ -85,6 +85,7 @@ public class MediaHTTPConnection extends IMediaHTTPConnection.Stub {
return map;
}
@Override
public void disconnect() {
teardownConnection();
mHeaders = null;
@@ -120,7 +121,11 @@ public class MediaHTTPConnection extends IMediaHTTPConnection.Stub {
"Range", "bytes=" + offset + "-");
}
if (mConnection.getResponseCode() == HttpURLConnection.HTTP_PARTIAL) {
int response = mConnection.getResponseCode();
// remember the current, possibly redirected URL
mURL = mConnection.getURL();
if (response == HttpURLConnection.HTTP_PARTIAL) {
// Partial content, we cannot just use getContentLength
// because what we want is not just the length of the range
// returned but the size of the full content if available.
@@ -145,16 +150,13 @@ public class MediaHTTPConnection extends IMediaHTTPConnection.Stub {
}
}
}
} else if (mConnection.getResponseCode()
!= HttpURLConnection.HTTP_OK) {
} else if (response != HttpURLConnection.HTTP_OK) {
throw new IOException();
} else {
mTotalSize = mConnection.getContentLength();
}
if (offset > 0
&& mConnection.getResponseCode()
!= HttpURLConnection.HTTP_PARTIAL) {
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();
@@ -174,6 +176,7 @@ public class MediaHTTPConnection extends IMediaHTTPConnection.Stub {
}
}
@Override
public int readAt(long offset, int size) {
return native_readAt(offset, size);
}
@@ -218,6 +221,7 @@ public class MediaHTTPConnection extends IMediaHTTPConnection.Stub {
}
}
@Override
public long getSize() {
if (mConnection == null) {
try {
@@ -230,6 +234,7 @@ public class MediaHTTPConnection extends IMediaHTTPConnection.Stub {
return mTotalSize;
}
@Override
public String getMIMEType() {
if (mConnection == null) {
try {
@@ -242,6 +247,11 @@ public class MediaHTTPConnection extends IMediaHTTPConnection.Stub {
return mConnection.getContentType();
}
@Override
public String getUri() {
return mURL.toString();
}
@Override
protected void finalize() {
native_finalize();
@@ -260,4 +270,5 @@ public class MediaHTTPConnection extends IMediaHTTPConnection.Stub {
}
private int mNativeContext;
}