Merge commit '1f90908c19ab24791bd54c856b32bb12682496eb' into gingerbread-plus-aosp
* commit '1f90908c19ab24791bd54c856b32bb12682496eb':
Prevent use of NFC api if device is not featurized for NFC.
Merge commit 'bc96c2848dadaa844f95e89708d9941f73bbf400' into gingerbread-plus-aosp
* commit 'bc96c2848dadaa844f95e89708d9941f73bbf400':
For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder.
Merge commit '004f968d0cf60c08d7b393129ed2d6e4304041e5' into gingerbread-plus-aosp
* commit '004f968d0cf60c08d7b393129ed2d6e4304041e5':
Link against the static libcrypto in external/openssl.
Merge commit '02ec432e6eff2ab59165c5b7c9b1a0d6689d0823' into gingerbread-plus-aosp
* commit '02ec432e6eff2ab59165c5b7c9b1a0d6689d0823':
If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. This is valid for video content according to the specs.
Merge commit '9e0e054388689fd618c84a283c28ee484477b44d'
* commit '9e0e054388689fd618c84a283c28ee484477b44d':
Fix a native crash in input dispatcher when windows are removed.
Merge commit '6ba052b4847d85831c38c9b8e2942cef4987e55b'
* commit '6ba052b4847d85831c38c9b8e2942cef4987e55b':
Add support for secure system overlays. (DO NOT MERGE)
Merge commit 'bce520e6460e712c0985f12cf212e2d72fd1b9e4'
* commit 'bce520e6460e712c0985f12cf212e2d72fd1b9e4':
DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi)
Merge commit '83366dfb96ad15e945a90270d329ce19dcf6b7e3' into gingerbread-plus-aosp
* commit '83366dfb96ad15e945a90270d329ce19dcf6b7e3':
Add the HTML5Audio class, to support the audio tag.
The initial (vendor) implementation had 4 perms, replace with 1.
Requires no permissions:
- Viewing UID, type of discovered tags and cards.
- Viewing the NDEF message contents of NDEF formatted tags and cards.
Requires android.permission.NFC
- Get/Set the local tag "MyTag"
- Creating or using a RawTagConnection (transceive())
- Creating or using a NdefTagConnection (write()/read())
Change-Id: I1b585c7d91738bed6261277061a48cf7c939482a
Signed-off-by: Nick Pelly <npelly@google.com>
Merge commit '746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4'
* commit '746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4':
Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.
Merge commit '13e46665ff69c1a37880762d7d611aacdf02dac7'
* commit '13e46665ff69c1a37880762d7d611aacdf02dac7':
Work on issue #3101415: Crespo apps seem to have their UID changed over time.
Merge commit 'e35cd5f569fe760385198f485e4610ad13033dd3'
* commit 'e35cd5f569fe760385198f485e4610ad13033dd3':
DO NOT MERGE - Updated media transport controls (hdpi and mdpi)
after setFastScrollEnabled(false)-->setFastScrollEnabled(true)
the overlay shows up at the top-left instead of center
Change-Id: Idd5d4640398def8391f99962bd1838a3bde98157
Set the thread pool size to one to fix the out-of-order packets
seen in sip service when the device is waken up from sleep.
bug:http://b/3099715
Change-Id: Ia169e3fde77488068c369e3345ecf6a6d8ddf792
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: If7f00cd8f2053acfc9319ca366d4a9c02bd396e6
Signed-off-by: Nick Pelly <npelly@google.com>
