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

Commit d2b566f3 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android Git Automerger
Browse files

am 61bdaaa1: Merge "ChromiumHTTPDataSource: Keep track of the redirected URL" 

* commit '61bdaaa1':
  ChromiumHTTPDataSource: Keep track of the redirected URL
parents 25da2f09 61bdaaa1

media/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp

+5 −0
Original line number Diff line number Diff line
@@ -108,6 +108,11 @@ status_t ChromiumHTTPDataSource::connect_l( 
    return mState == CONNECTED ? OK : mIOResult;

}



void ChromiumHTTPDataSource::onRedirect(const char *url) {

    Mutex::Autolock autoLock(mLock);

    mURI = url;

}



void ChromiumHTTPDataSource::onConnectionEstablished(

        int64_t contentSize, const char *contentType) {

    Mutex::Autolock autoLock(mLock);

media/libstagefright/chromium_http/support.cpp

+1 −0
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ bool SfDelegate::getUID(uid_t *uid) const { 
void SfDelegate::OnReceivedRedirect(

            net::URLRequest *request, const GURL &new_url, bool *defer_redirect) {

    MY_LOGV("OnReceivedRedirect");

    mOwner->onRedirect(new_url.spec().c_str());

}



void SfDelegate::OnAuthRequired(

media/libstagefright/include/ChromiumHTTPDataSource.h

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ private: 
    void onConnectionFailed(status_t err);

    void onReadCompleted(ssize_t size);

    void onDisconnectComplete();

    void onRedirect(const char *url);



    void clearDRMState_l();