daniel_tomas
99e267ebcf
am 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation
...
* commit '7bcd2c62ebfad640e8082c1dc700c9d8c57aba81':
New API added in NfcAdapter to enable/disable SE card emulation
2011-02-16 09:41:00 -08:00
daniel_tomas
7bcd2c62eb
New API added in NfcAdapter to enable/disable SE card emulation
...
Change-Id: Ia0c123873ba9265b45e847d1a30c1300de3c1346
2011-02-16 09:27:25 -08:00
Nick Pelly
8c8e9d9a7f
am 1df862a4: Minor doc update.
...
* commit '1df862a4656bb0d7a3329311b1e243fc6db32448':
Minor doc update.
2011-02-16 09:23:08 -08:00
Nick Pelly
1df862a465
Minor doc update.
...
Change-Id: I1d29adfccbdc196a145a2c2a044d63b00e5f788b
2011-02-16 09:18:34 -08:00
Andreas Huber
16d94f580a
am 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread
...
* commit '8db7a7bfadc7bdfa30f60bb06063f91b19234096':
DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary
2011-02-16 09:02:08 -08:00
Andreas Huber
8db7a7bfad
Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread
2011-02-16 08:50:37 -08:00
Robert Ly
c3ebf27a51
am 4bebbe5f: Merge "Adding package summary for nfc.tech package" into gingerbread
...
* commit '4bebbe5fea1b6d7f5deff6d41d7633308607c08b':
Adding package summary for nfc.tech package
2011-02-15 22:54:52 -08:00
Vairavan Srinivasan
68a4e0a38f
frameworks/base: acquire lock on am only when needed
...
appendDropBoxProcessHeaders acquires a lock on am while accessing
ProcessRecord (even if it is null). Watchdog thread ends up invoking
this function (with a null ProcessRecord) to add the stack file to
dropbox. This function would block if and when the watchdog thread is
invoked due to unavailability of lock on am resulting in a deadlock.
This would prevent watchdog from killing system_server.
Change-Id: Ieb34b767779cb587e0c5f536b9b7ba44fb9a28d9
2011-02-15 21:42:57 -08:00
Robert Ly
4bebbe5fea
Merge "Adding package summary for nfc.tech package" into gingerbread
2011-02-15 17:44:56 -08:00
Robert Ly
2deeefeb5e
Adding package summary for nfc.tech package
...
Change-Id: Ibbf55c21dcaf48b4eb369e78c54fb1023abb3cb3
2011-02-15 17:41:47 -08:00
Andreas Huber
ea47cb4ede
DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary
...
and continue even if we were unable to poke a hole into the firewall.
Change-Id: I5757a2521b8d81a42d03cca379179ce2c9ee46e7
related-to-bug: 3457201
2011-02-15 14:02:34 -08:00
John Wang
3901402600
am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread
...
* commit '29853a356bb6ddb094df6d0f5dd04e2a63f25147':
Only decode EXT1 tag when it is available.
2011-02-15 12:38:38 -08:00
John Wang
29853a356b
Merge "Only decode EXT1 tag when it is available." into gingerbread
2011-02-15 12:34:37 -08:00
Andreas Huber
e0c9f2757b
am d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
...
* commit 'd1ba051a465518fa4325c364ed77025fc1a2a794':
DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
2011-02-15 11:49:03 -08:00
Andreas Huber
d1ba051a46
DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
...
In this particular case these RTSP servers were implemented as local services,
retransmitting live streams via a local RTSP server instance.
They picked wrong rtp/rtcp port pairs (odd rtp port), blank lines in the session
description, wrong case of the format description, relative base URLs...
Change-Id: I502a04a7e1d690fd461b7ecf0b56c6a6c2ac1325
related-to-bug: 3452103
2011-02-15 11:02:43 -08:00
Gilles Debunne
9b90062b96
Double tap on a word no longer opens context menu. DO NOT MERGE
...
Bug 3451965
Change-Id: I2d693eda15da6562dd15eceb4109c0d588f224c9
2011-02-14 17:48:17 -08:00
John Wang
c2cbc730fc
Only decode EXT1 tag when it is available.
...
Normally ADN record is stored in two tags, EFADN_TAG and EFEXT1_TAG. But if the EFEXT1_TAG is not set in EF_PBR entry,
it shouldn't be decoded otherwise it causes NullPointerException in readAdnFileAndWait().
bug: 3376954
Change-Id: I744cf5cb8662c75be1e7c6219fa92c67bdda82f2
2011-02-14 17:44:13 -08:00
Eric Fischer
3537011651
Import revised translations. DO NOT MERGE
...
Change-Id: If134b2db7449d3646541fc83e8973938926fb481
2011-02-14 17:21:02 -08:00
Xavier Ducrohet
d06c1afbb9
Add --non-constant-id to aapt.
...
This option enbables creating resource constant in the R class
that are not actual constant, but simply static fields.
The goal is to build library projects with these types of
IDs so that the constant does not get inlined in the library
code, since the ID for the library resources only are not
the final values.
The final resource IDs, generated from the main project and
its library(ies), will have proper constant with the final
values.
This allows us to generate binary library bundle (a jar file
and associated resources) that can be distributed. Additionally,
this will let us make the library project support in Eclipse
much more robust and a better user experience overall.
Change-Id: Ibe2f08d68493fde658fc3f7606abf7446f312ad2
2011-02-14 17:06:19 -08:00
Scott Main
b269346ca3
am d4952380: fix md5sum for windows installer
...
* commit 'd49523809714b04636a9ac43de1c508ed1dbfc38':
fix md5sum for windows installer
2011-02-14 09:14:12 -08:00
Scott Main
d495238097
fix md5sum for windows installer
...
Change-Id: I85a3f5c9c39b0bb5d9c8654c8b7702e7bd0235f2
2011-02-14 08:56:54 -08:00
Robert Greenwalt
7e62fd1436
DO NOT MERGE - backport of l92a02b31 from master
...
Fix handling of multiple possible default networks.
bug:3328196
Change-Id: I994f1621ff82de454192945a9cae961e1710d537
2011-02-11 17:32:58 -08:00
Robert Ly
810c1c0c35
am 322891c6: Doc change: nfc dev guide
...
* commit '322891c689c845b5aa63dbca606967eb9f8f900b':
Doc change: nfc dev guide
2011-02-11 13:18:31 -08:00
Jean-Baptiste Queru
6d104f118a
am 6901f963: am 93552de8: Merge "stubs"
...
* commit '6901f963c27f2d0a9caf56b42b6054d0cecc84d1':
stubs
2011-02-11 10:04:53 -08:00
Jean-Baptiste Queru
6901f963c2
am 93552de8: Merge "stubs"
...
* commit '93552de8e305027fb003401e347b9493c64c981f':
stubs
2011-02-11 09:54:59 -08:00
Jean-Baptiste Queru
93552de8e3
Merge "stubs"
2011-02-11 09:39:46 -08:00
Steve Block
1da970625c
stubs
...
Change-Id: I6bc0b8e9d4412a0b60c6226fbd2b7a6d15aceb22
2011-02-11 09:33:40 -08:00
Jamie Gennis
c86d904b71
Prevent SurfaceFlinger from using layer token 31.
...
Bug: 2964479
Change-Id: I81e948924bff35b8b300d409f2c09f3779bcdeec
2011-02-10 16:18:36 -08:00
Robert Ly
322891c689
Doc change: nfc dev guide
...
Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447
2011-02-10 13:42:13 -08:00
Gilles Debunne
8e28ab22de
am 2050de5b: Text selection is broken.
...
* commit '2050de5b9a5c097e30545ab822211d49031bd9dc':
Text selection is broken.
2011-02-09 16:49:42 -08:00
Dianne Hackborn
e5dea7537c
Attempt to reduce problems from issue #3183612
...
java.lang.SecurityException: Neither user 1209 nor current...
...process has android.permission.WAKE_LOCK.
It looks like, somehow, the calling uid/pid of the SyncHandler
thread is getting corrupted. This change has Looper check for
these values changing from their original defaults and, if there
is a problem, resetting them and logging a WTF. Hopefully this
will avoid crashing the process, while also giving us more
helpful error reports about what is going on.
Change-Id: Iff06d575951fb8c06e2a3c31141f2907a715eb81
2011-02-09 14:19:23 -08:00
Gilles Debunne
2050de5b9a
Text selection is broken.
...
Bug 3439569
Lazy initialization code was not back-ported.
Change-Id: I9815f649891e2ddc602383488749144686ab1dd3
2011-02-09 14:17:22 -08:00
Wink Saville
bdce3d2c35
am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation"
...
* commit '01a5eba810bfdf5b111a7546814e174c1d57b6e7':
Telephony: Fix cb sms implementation
2011-02-09 13:45:37 -08:00
Wink Saville
01a5eba810
am 6e25789f: Merge "Telephony: Fix cb sms implementation"
...
* commit '6e25789fbe7ac283021156b17f406acb48850292':
Telephony: Fix cb sms implementation
2011-02-09 13:42:45 -08:00
Wink Saville
6e25789fbe
Merge "Telephony: Fix cb sms implementation"
2011-02-09 13:09:24 -08:00
Mathias Agopian
d0f27f435e
am ada1b6f2: Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread
...
* commit 'ada1b6f297596cac4451edbc83df060a31cdda68':
fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep
2011-02-09 13:09:12 -08:00
Mathias Agopian
ada1b6f297
Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread
2011-02-09 13:06:00 -08:00
Scott Main
b605869cd3
am 07cefd3c: add 2.3.3 announcement to site home page
...
* commit '07cefd3cc3d8d27750e4fc725d9aec86250750dd':
add 2.3.3 announcement to site home page
2011-02-09 13:03:11 -08:00
Scott Main
07cefd3cc3
add 2.3.3 announcement to site home page
...
Change-Id: I4323a1a30fad8a67cce55baba9f7a89c4bdd4494
2011-02-09 10:17:08 -08:00
Jeff Hamilton
c1cc9ba6d1
am 58c9d472: Merge "More documentation updates for NFC." into gingerbread
...
* commit '58c9d4726ebf3165b0dbbcebb1130dfc5502bfe9':
More documentation updates for NFC.
2011-02-09 00:36:53 -08:00
Jeff Hamilton
58c9d4726e
Merge "More documentation updates for NFC." into gingerbread
2011-02-09 00:34:22 -08:00
Jeff Hamilton
28319c0cec
More documentation updates for NFC.
...
Change-Id: Ie134d4296ee12333e6647ce76126f9767ba1ba34
2011-02-09 17:26:47 +09:00
Dirk Dougherty
8d56f6decf
am a3f53afd: Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread
...
* commit 'a3f53afd13bc1722464e169cb82a01d3898852b5':
Doc change: Add version notes for Android 2.3.3.
2011-02-08 23:27:53 -08:00
Nick Pelly
47dac545da
am 39cf3a44: Document NFC permissions.
...
* commit '39cf3a445e507f219ecc8a476f6038f095d9d520':
Document NFC permissions.
2011-02-08 23:25:29 -08:00
Dirk Dougherty
a3f53afd13
Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread
2011-02-08 23:24:22 -08:00
Nick Pelly
39cf3a445e
Document NFC permissions.
...
Change-Id: Ib1b1625058c9c673692f3fbcb3546ec7c2d54a07
2011-02-09 16:10:46 +09:00
Dirk Dougherty
237a3440d3
Doc change: Add version notes for Android 2.3.3.
...
Change-Id: I32dffaee15079a3dffb30dcdff6587be03378fc5
2011-02-08 20:10:51 -08:00
Jeff Hamilton
1ac35411f1
am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread
...
* commit '584afa8dde1777b181e773a491416769f25607a8':
Improve the docs a bit for foreground dispatch.
2011-02-08 19:33:53 -08:00
Jeff Hamilton
584afa8dde
Merge "Improve the docs a bit for foreground dispatch." into gingerbread
2011-02-08 19:30:47 -08:00
Jeff Hamilton
167d9e473f
Improve the docs a bit for foreground dispatch.
...
Change-Id: I4179133a0956bc66a49201c20f1dd2d6d67874d2
2011-02-09 12:30:18 +09:00