Merge commit 'baf5608941ae4de2bb5620fc81291f33da9d57ac'
* commit 'baf5608941ae4de2bb5620fc81291f33da9d57ac':
Never show overscroll if the page scrolls at all.
Merge commit '66f1c459ac15d1dba1850cb30759500d35078f29' into gingerbread-plus-aosp
* commit '66f1c459ac15d1dba1850cb30759500d35078f29':
Update the documentation for content provider security.
Merge commit '7d73b7066867368ebb30dd67a1649ae9db04b93e'
* commit '7d73b7066867368ebb30dd67a1649ae9db04b93e':
Reduce the time it takes to decay the glow after a pull.
Merge commit 'e1f3976bb4eab0d7c46bc8596679d4d00695148c' into gingerbread-plus-aosp
* commit 'e1f3976bb4eab0d7c46bc8596679d4d00695148c':
Make sure we cache the sampleTable again if using the caching datasource.
Merge commit 'feebaf35c0edaed87edc6eb33a33ad9df1a209d6' into gingerbread-plus-aosp
* commit 'feebaf35c0edaed87edc6eb33a33ad9df1a209d6':
Don't crash on null Vibrator during reboot.
QA-impact: This fixes http streaming again which I broke about 2 days ago. The previously observed symptoms were stuttering playback of http streams (think YouTube) after a certain playback position.
Change-Id: I14050e3522ecd62c90d29310efdf508fdd2e87b5
related-to-bug: 3098873
Merge commit '5bfa3a34eaef759c3ec4def76f646eb1c0bf997f'
* commit '5bfa3a34eaef759c3ec4def76f646eb1c0bf997f':
implement part of [3094280] New animation for screen on and screen off
Merge commit '27c7fb1a861776b4fdc2632697e4e25eee83617f'
* commit '27c7fb1a861776b4fdc2632697e4e25eee83617f':
Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
Merge commit '0982d8d0d3b9d685a3c159519cb0d2eb705e3027'
* commit '0982d8d0d3b9d685a3c159519cb0d2eb705e3027':
Fix sometimes mExpandedView will appear while screen transforming.
Merge commit 'b58af2b8b3871436942d0e2c878c906bffaa2fb0'
* commit 'b58af2b8b3871436942d0e2c878c906bffaa2fb0':
Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify
Merge commit 'bb5d7c21615128630fc9d08274bb14ca01e2124b'
* commit 'bb5d7c21615128630fc9d08274bb14ca01e2124b':
Attempt to derive the avg. bitrate of the entire stream from metadata.
Values have been taken from the current TextAppearance.SearchResult
style. This was making WebTextView in the Browser show unreadable
autocomplete suggestions (pale grey text on a white background).
Change-Id: I35961e12ab96d29791c495723709b2eff5714471
NFC service is now an application service in packages/apps/Nfc.
NFC service is registered through ServiceManager.addService(), and the proxy
object NfcAdapter obtains a handle to it through ServiceManager.getService().
**Important** Had to add new symbols AID_NFC / NFC_UID / android.uid.nfc and
modify service_manager.c, Process.java and PackageManagerService.java in order
to force the com.android.nfc process to take a fixed uid, so that it can use
ServiceManager.addService().
Most of the JNI has moved to packages/apps/Nfc/jni. However NdefRecord and
NdefMessage require some in-process native code, so android_com_NdefMessage.cpp
and android_com_NdefRecord.cpp stay in frameworks/base/core/jni. They link to
a very small library libnfc_ndef.so that implements NDEF message parsing. This
has been added to core.mk so all devices (even without NFC hardware) can work
with NDEF data.
Bug: 3041259
Bug: 3097445
Change-Id: If8f00ce8f2053acfc9319ca366d4a9c02bd396e6
Signed-off-by: Nick Pelly <npelly@google.com>
Merge commit '8e4f3c76dd7f5596fa2fe10bdf008d4c02353160'
* commit '8e4f3c76dd7f5596fa2fe10bdf008d4c02353160':
Some webcams output rtp streams but never send any rtcp data in violation of
Merge commit '5cfa877e22a2d76d1ea36c3f0c2c708248da3d0e'
* commit '5cfa877e22a2d76d1ea36c3f0c2c708248da3d0e':
docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage
Merge commit '28b93967d0e702304c7edec854a29d5ab88bfce0'
* commit '28b93967d0e702304c7edec854a29d5ab88bfce0':
HTTP Live content that are tagged as complete are now seekable.
Merge commit '78a76fea28b8101c1860a2f1115329e3e63abda3' into gingerbread-plus-aosp
* commit '78a76fea28b8101c1860a2f1115329e3e63abda3':
Revert to using epoll_wait().
Added support for calibrating touch size for devices that report
size as an area measurement rather than as a width.
Fixed some bugs.
Bug: 3096045
Change-Id: I30a12e73752883516ed054f8af407204bca45814
