revert "HLS seeking: call readAt() on new thread"

This reverts commit Ie527aeaff91e1b82c7e707a6feaf79548c7ac380

Bug: 119900000
Test: go/ag/5140159

Change-Id: Ia8b2f3efc2f3551e749c16c6c8dfbc070f8bb980
This commit is contained in:
Dichen Zhang
2019-02-27 11:01:40 -08:00
parent 0b2044a91c
commit 6593694f97

View File

@@ -37,7 +37,6 @@ import java.net.URL;
import java.net.UnknownServiceException;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
/** @hide */
public class MediaHTTPConnection extends IMediaHTTPConnection.Stub {
@@ -67,7 +66,6 @@ public class MediaHTTPConnection extends IMediaHTTPConnection.Stub {
// from com.squareup.okhttp.internal.http
private final static int HTTP_TEMP_REDIRECT = 307;
private final static int MAX_REDIRECTS = 20;
private AtomicBoolean mIsConnected = new AtomicBoolean(false);
@UnsupportedAppUsage
public MediaHTTPConnection() {
@@ -91,7 +89,6 @@ public class MediaHTTPConnection extends IMediaHTTPConnection.Stub {
mAllowCrossDomainRedirect = true;
mURL = new URL(uri);
mHeaders = convertHeaderStringToMap(headers);
mIsConnected.set(true);
} catch (MalformedURLException e) {
return null;
}
@@ -142,14 +139,7 @@ public class MediaHTTPConnection extends IMediaHTTPConnection.Stub {
@Override
@UnsupportedAppUsage
public void disconnect() {
if (mIsConnected.getAndSet(false)) {
(new Thread() {
@Override
public void run() {
teardownConnection();
}
}).start();
}
teardownConnection();
mHeaders = null;
mURL = null;
}
@@ -334,14 +324,7 @@ public class MediaHTTPConnection extends IMediaHTTPConnection.Stub {
@Override
@UnsupportedAppUsage
public int readAt(long offset, int size) {
if (!mIsConnected.get()) {
return -1;
}
int result = native_readAt(offset, size);
if (!mIsConnected.get()) {
return -1;
}
return result;
return native_readAt(offset, size);
}
private int readAt(long offset, byte[] data, int size) {