Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d087354 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "revert "HLS seeking: call readAt() on new thread"" am: 00a4170c am: a97abe70 am: c47b1fc2"
parents a0a47c44 f3e094ff
Loading
Loading
Loading
Loading
+2 −19
Original line number Diff line number Diff line
@@ -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();
        }
        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) {