Merge commit '6b04d5c735df7fa05c705f979eff8821989ab73d' into kraken
* commit '6b04d5c735df7fa05c705f979eff8821989ab73d':
docs: revisions to the installLocation documentation
Merge commit '4981863de52941f053bf002ae2f9c8f705534599' into froyo-plus-aosp
* commit '4981863de52941f053bf002ae2f9c8f705534599':
docs: revisions to the installLocation documentation
Merge commit '1531d211249783bdfc3ded9323397f22a5f1fc34' into kraken
* commit '1531d211249783bdfc3ded9323397f22a5f1fc34':
Avoid calling proxy.playbackEnded() again in onCustomViewHidden().
Merge commit '3fe36fe589809b732db12054428166adb069f53b' into froyo-plus-aosp
* commit '3fe36fe589809b732db12054428166adb069f53b':
Avoid calling proxy.playbackEnded() again in onCustomViewHidden().
Merge commit 'd06c435c3f520ef2012fdd331dac76b1621a72e6' into kraken
* commit 'd06c435c3f520ef2012fdd331dac76b1621a72e6':
Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error handling on http connection.
Merge commit 'c6c8a1e96f2cccb7b2bf7aec5140a3eacb7a922a' into froyo-plus-aosp
* commit 'c6c8a1e96f2cccb7b2bf7aec5140a3eacb7a922a':
Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error handling on http connection.
Merge commit 'a327dbddccb002919b98bdfd7abd81619826a3b8' into kraken
* commit 'a327dbddccb002919b98bdfd7abd81619826a3b8':
Fix issue #2541849: System crash when an app with active notifications...
Merge commit 'ecb0e637870553f9c12dc6b9178de0512563af9c' into froyo-plus-aosp
* commit 'ecb0e637870553f9c12dc6b9178de0512563af9c':
Fix issue #2541849: System crash when an app with active notifications...
...in status bar is installed on sdcard and device is powered down.
Don't do the GC until everyone has had a chance to take care of external
storage going away.
This is more correct, but doesn't completely fix the problem that
appears when shutting down.
Change-Id: I24b19337ba6262cfd8d010645dbf67e76ea03058
Merge commit '75a9cbaea42d1e28957dd3ff59899b4c75ffd8db' into kraken
* commit '75a9cbaea42d1e28957dd3ff59899b4c75ffd8db':
Update API and javadoc according to API review.
Merge commit '3f4639a6611222ae1ae5493de49213250d292139' into froyo-plus-aosp
* commit '3f4639a6611222ae1ae5493de49213250d292139':
Update API and javadoc according to API review.
Move install location values to secure settings.
Diable attribute for UI. Set default value to auto.
Add command line interface to set install location via pm.
Change-Id: I80e97b3d24845adad7102f40dcbe238f00efa406
Merge commit '822a7e2defcfbd006a7840e1da19cf0827d46736' into kraken
* commit '822a7e2defcfbd006a7840e1da19cf0827d46736':
Fix issue #2578244: playing audio file downloaded by the browser...
Merge commit 'ce59fb8b684357f2a10ab62368beeece34bc0e5d' into froyo-plus-aosp
* commit 'ce59fb8b684357f2a10ab62368beeece34bc0e5d':
Fix issue #2578244: playing audio file downloaded by the browser...
Merge commit '520d684093b50c25d06aac652ad4bca42ff7e862' into kraken
* commit '520d684093b50c25d06aac652ad4bca42ff7e862':
Revert "Use the content width to calculate the zoom overview"
...shows an image downloaded by the browser
The downloads directory needs to be non-plural for backwards compatibility.
Change-Id: Ifb6ddf8ee980a57ad113a5fc8b51f5acd8df5955
Merge commit '667543cdb5aad1dc7ef567d57d34f1ac975b02a7' into froyo-plus-aosp
* commit '667543cdb5aad1dc7ef567d57d34f1ac975b02a7':
Revert "Use the content width to calculate the zoom overview"
mResources will be null if we failed loading them because the app
is on external storage that has been unmounted.
Change-Id: If0dbbdc0c3441fa10d0ab074568361524db1c8db
