The API is implemented but still do not support muli-protocol tags.
Change-Id: I5cea3eec7b5b92e8e1106d4660e2400e4433e943
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
Merge commit '9bb8e5cc3e9f8ae2c46967ee1fd422f3bf1e9429'
* commit '9bb8e5cc3e9f8ae2c46967ee1fd422f3bf1e9429':
Test that we don't leak sensitive information when logging cookies.
Merge commit 'a8faf91fa558be1235d508e776eb24be4429585c'
* commit 'a8faf91fa558be1235d508e776eb24be4429585c':
fix [3095607] Gingerbread screen turn-on animation does not show the last frame
* Increase the opacity of the drag thumbnail a bit
* Properly present window-local drag locations; this fixes drags into
the status bar
* Pass the current drag touch point in DRAG_STARTED. This may
be reconsidered, but might conceivably be useful to someone.
Change-Id: I77690e82e9831ed6be412990c1c9da92e700a501
Merge commit '77c011ba75ee1403c9b7626e4676cd3c8746605b' into gingerbread-plus-aosp
* commit '77c011ba75ee1403c9b7626e4676cd3c8746605b':
Set default heap size to 5MB.
Merge commit '5e7b7cd65bea53357ecad68a31a52883897c824b' into gingerbread-plus-aosp
* commit '5e7b7cd65bea53357ecad68a31a52883897c824b':
range checking for tnf
Merge commit 'dc83fd5a502b255dd29a4ab351fc902105ca6bb8' into gingerbread-plus-aosp
* commit 'dc83fd5a502b255dd29a4ab351fc902105ca6bb8':
Import revised translations DO NOT MERGE
Merge commit '36e65ffd16f2610dcec702e23d596fe4eb6b6c4a' into gingerbread-plus-aosp
* commit '36e65ffd16f2610dcec702e23d596fe4eb6b6c4a':
Fix a native crash in input dispatcher when windows are removed.
Merge commit 'c1a564b108c511c0bdd699567c245b031930e718' into gingerbread-plus-aosp
* commit 'c1a564b108c511c0bdd699567c245b031930e718':
Add support for secure system overlays. (DO NOT MERGE)
Merge commit 'b3c2d4807f6bc631e2d1091ca4ebb8df39195bca' into gingerbread-plus-aosp
* commit 'b3c2d4807f6bc631e2d1091ca4ebb8df39195bca':
DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi)
Merge commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678' into gingerbread-plus-aosp
* commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678':
Include the framework copy of the OpenMAX headers instead of referencing external/opencore.
Merge commit 'ff7a7a455c15077e2b691efa370619f06058f697' into gingerbread-plus-aosp
* commit 'ff7a7a455c15077e2b691efa370619f06058f697':
Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.
Merge commit '736f5ec476526f3431d81dec5fb695bdee27e21a' into gingerbread-plus-aosp
* commit '736f5ec476526f3431d81dec5fb695bdee27e21a':
Work on issue #3101415: Crespo apps seem to have their UID changed over time.
Merge commit '4e08a985418f581b4ca8c46316c85defd7b173cd' into gingerbread-plus-aosp
* commit '4e08a985418f581b4ca8c46316c85defd7b173cd':
fix build DO NOT MERGE
Merge commit '73dbdc35d4db5a03310bec8d8d7dcb58dba0c940' into gingerbread-plus-aosp
* commit '73dbdc35d4db5a03310bec8d8d7dcb58dba0c940':
DO NOT MERGE - Updated media transport controls (hdpi and mdpi)
Merge commit '36cb18cf0684cadb3736969ff96f37d5eb9bb1a4' into gingerbread-plus-aosp
* commit '36cb18cf0684cadb3736969ff96f37d5eb9bb1a4':
Line up textfield with WebTextView more often.
Merge commit 'f8834f878fb6911cbd4719640cd2e6bf3a958a92' into gingerbread-plus-aosp
* commit 'f8834f878fb6911cbd4719640cd2e6bf3a958a92':
fetch macaddr right after supplicant connection
Merge commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b' into gingerbread-plus-aosp
* commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b':
docs: fix typo; surface dev guide link in package description
