diff options
| author | Andreas Huber <andih@google.com> | 2011-02-24 14:49:10 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-24 14:49:10 -0800 |
| commit | a28f6f11f22963e3679537e83f243edeaa5ee17c (patch) | |
| tree | e22a1f824e309604857f008df2d2dfa48f9e4e5c /media/libstagefright/AwesomePlayer.cpp | |
| parent | 26c9612ffa2bc25bb167760deeade905b3fd92dd (diff) | |
| parent | 53182c439cf16f910974fd1f9d6c3002dda445eb (diff) | |
| download | frameworks_base-a28f6f11f22963e3679537e83f243edeaa5ee17c.zip frameworks_base-a28f6f11f22963e3679537e83f243edeaa5ee17c.tar.gz frameworks_base-a28f6f11f22963e3679537e83f243edeaa5ee17c.tar.bz2 | |
Merge "Suppress the logging of URLs when in incognito mode."
Diffstat (limited to 'media/libstagefright/AwesomePlayer.cpp')
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 36623f69..bcf5a12 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -247,6 +247,22 @@ status_t AwesomePlayer::setDataSource_l( if (headers) { mUriHeaders = *headers; + + ssize_t index = mUriHeaders.indexOfKey(String8("x-hide-urls-from-log")); + if (index >= 0) { + // Browser is in "incognito" mode, suppress logging URLs. + + // This isn't something that should be passed to the server. + mUriHeaders.removeItemsAt(index); + + mFlags |= INCOGNITO; + } + } + + if (!(mFlags & INCOGNITO)) { + LOGI("setDataSource_l('%s')", mUri.string()); + } else { + LOGI("setDataSource_l(URL suppressed)"); } // The actual work will be done during preparation in the call to @@ -1538,7 +1554,8 @@ status_t AwesomePlayer::finishSetDataSource_l() { if (!strncasecmp("http://", mUri.string(), 7) || !strncasecmp("https://", mUri.string(), 8)) { - mConnectingDataSource = new NuHTTPDataSource; + mConnectingDataSource = new NuHTTPDataSource( + (mFlags & INCOGNITO) ? NuHTTPDataSource::kFlagIncognito : 0); mLock.unlock(); status_t err = mConnectingDataSource->connect(mUri, &mUriHeaders); |