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 '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)
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>
Merge commit '10d48f26e72dc7978ae683e8f99cc71409eb75ef'
* commit '10d48f26e72dc7978ae683e8f99cc71409eb75ef':
Debug logs for issue #3101415: Apps seem to have their UID changed over time.
Merge commit '36e7790b6b3c2c36c67fbe5dc2e2313cdd537349'
* commit '36e7790b6b3c2c36c67fbe5dc2e2313cdd537349':
NFC: Move NFC service implementation out of system_server.
3094621: add "wipe sd card" option to factory data reset
3094609: collapse unmount/format into one command
Also since we have decided that it is important to consider
the Crespo storage as internal storage, DevicePolicyManager
gets a new API to be able to wipe it. (No big deal, since
all of the work for this is now done in the implementation
of the new UI.)
Change-Id: I32a77c410f710a87dcdcbf6586c09bd2e48a8807
Merge commit 'cb90947bf8ed2c898c1b7e529dd0c99d112ed611'
* commit 'cb90947bf8ed2c898c1b7e529dd0c99d112ed611':
Make sure we cache the sampleTable again if using the caching datasource.
Merge commit '6e48b5f97af6d67574fee6053174c184f87ce583'
* commit '6e48b5f97af6d67574fee6053174c184f87ce583':
Updated GPS icons and new status bar background
Merge commit 'c61c98fdba0f705e29d6d1e9fc81e33d4cb07ff9'
* commit 'c61c98fdba0f705e29d6d1e9fc81e33d4cb07ff9':
DO NOT MERGE: Private API to pass the selected tab through QuickContacts
Merge commit 'fd28b45125f7d58a9d88c0dd09fe610f6e5878df'
* commit 'fd28b45125f7d58a9d88c0dd09fe610f6e5878df':
Another attempt at popup assets (hdpi and mdpi)
Merge commit '9f6d18cadf9ac50062063f5f5ff5de7f6895696a'
* commit '9f6d18cadf9ac50062063f5f5ff5de7f6895696a':
[3095807] screen takes a long time to turn on
