Jesse Wilson
c66f220c44
am b0641d4a
: Merge "Use ENTRY and EXIT macros for strcmp, memcpy, atexit."
...
* commit 'b0641d4a446fa98c72fd6252e5a5ca7e44c41f1f':
Use ENTRY and EXIT macros for strcmp, memcpy, atexit.
2011-10-12 17:43:06 -07:00
Jesse Wilson
b0641d4a44
Merge "Use ENTRY and EXIT macros for strcmp, memcpy, atexit."
2011-10-12 07:51:53 -07:00
The Android Automerger
df331f5f9b
merge in ics-release history after reset to master
2011-10-11 05:32:11 -07:00
Evgeniy Stepanov
487b613e57
Use ENTRY and EXIT macros for strcmp, memcpy, atexit.
...
Without this change strcmp size is zero (not set), and it gets
ignored by Valgrind. Changes to memcpy and atexit don't affect the
generated binary in any way.
Change-Id: I05818cb5951f75901dc8c0eef02807a2e83a9231
2011-10-11 12:12:05 +04:00
Elliott Hughes
f5c6dc8b7c
am faa7c1d2
: Update to tzdata2011l.
...
* commit 'faa7c1d29f9ed0b3eb252bb0bd43e7596eed5d9c':
Update to tzdata2011l.
2011-10-10 14:51:37 -07:00
Elliott Hughes
faa7c1d29f
Update to tzdata2011l.
...
This affects Asia/Hebron and Pacific/Fiji (and historical data for
America/Sitka).
Change-Id: I111a34038e44416f1900f774bdb78750e815eb5f
2011-10-10 14:05:53 -07:00
The Android Automerger
bf8f6bb820
merge in ics-release history after reset to master
2011-09-30 06:44:15 -07:00
David 'Digit' Turner
b7001bce52
am 0a1b306f
: am 32ca348e
: am ce0d646c
: resolved conflicts for merge of 6cda7b62
to gingerbread-plus-aosp
...
* commit '0a1b306fe1e86b4d218506d2d3d3e72df8f795ba':
Bionic: x86: Fix libm macro definitions
2011-09-30 05:46:33 -07:00
David 'Digit' Turner
0a1b306fe1
am 32ca348e
: am ce0d646c
: resolved conflicts for merge of 6cda7b62
to gingerbread-plus-aosp
...
* commit '32ca348eecb114b9b2a9393f178c82310f590ddb':
Bionic: x86: Fix libm macro definitions
2011-09-29 21:09:08 -07:00
David 'Digit' Turner
32ca348eec
am ce0d646c
: resolved conflicts for merge of 6cda7b62
to gingerbread-plus-aosp
...
* commit 'ce0d646cc0beb6b44d5429d01e51d00005264f44':
Bionic: x86: Fix libm macro definitions
2011-09-29 21:03:00 -07:00
David 'Digit' Turner
ce0d646cc0
resolved conflicts for merge of 6cda7b62
to gingerbread-plus-aosp
...
Change-Id: I85bd5291c2a9cd29bff538b6d5a4dcd73f85a1fd
2011-09-30 05:56:51 +02:00
Lorenzo Colitti
74cf48f0c1
am 229ab1a3
: Merge "Send both A and AAAA queries if all probes fail."
...
* commit '229ab1a33ea79fcea42302fbe9680a6c1047325f':
Send both A and AAAA queries if all probes fail.
2011-09-29 10:53:51 -07:00
Lorenzo Colitti
b99c197b27
am 4638822f
: Merge "Revert "Use framework hints to determine dns query type.""
...
* commit '4638822fc07aae8cc08600c85c16183ed8d5ef79':
Revert "Use framework hints to determine dns query type."
2011-09-29 10:53:50 -07:00
Lorenzo Colitti
229ab1a33e
Merge "Send both A and AAAA queries if all probes fail."
2011-09-29 10:52:23 -07:00
Lorenzo Colitti
4638822fc0
Merge "Revert "Use framework hints to determine dns query type.""
2011-09-29 10:52:16 -07:00
Bruce Beare
6cda7b6249
Bionic: x86: Fix libm macro definitions
...
http://code.google.com/p/android/issues/detail?id=19276
GCC would remove inline asm due to lack of knowledge
of FPU register changes.
Change-Id: I9f9e8623fa6580843b7cd8178439ace8c2db2d51
Signed-off-by: Mark D Horn <mark.d.horn@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Author: Jingwei Zhang <jingwei.zhang@intel.com>
2011-09-29 17:35:33 +02:00
Lorenzo Colitti
f432de2de7
Send both A and AAAA queries if all probes fail.
...
AI_ADDRCONFIG is currently implemented by trying to connect
to well-known addresses in order to see if IPv4 and/or IPv6
connectivity is available.
In some cases (e.g., walled gardens with no global
connectivity) both probes can fail. If this happens,
query for both IPv4 and IPv6 addresses instead of doing
nothing and failing the query.
Bug: 5284168
Change-Id: I4e3a69ea86fb6d839a6bd31236b98da81e5cbf45
2011-09-28 22:38:08 -07:00
Lorenzo Colitti
b82532d11a
Revert "Use framework hints to determine dns query type."
...
Change Ife82a8d8 broke IPv6 on wifi. Change I4e3a69ea is
an alternate approach that does not require any framework
changes.
Bug: 5284168
Change-Id: Ib52614be3875a2ae2eaedd1be265f90e506eda41
2011-09-28 22:37:41 -07:00
The Android Automerger
cd17f88010
merge in ics-release history after reset to master
2011-09-28 17:56:54 -07:00
Mathias Agopian
451159035a
am bda5da07
: fix prototype of dladdr
...
* commit 'bda5da074eab4bdf374e1f4a19d480c62c72f5ff':
fix prototype of dladdr
2011-09-28 15:18:12 -07:00
Mathias Agopian
bda5da074e
fix prototype of dladdr
...
this breaks C++ source code in particular.
Change-Id: Ie06b5d31d23b5455e6950c470adc64dd5e7784df
2011-09-28 12:17:34 -07:00
The Android Automerger
c902908999
merge in ics-release history after reset to master
2011-09-27 06:59:11 -07:00
Elliott Hughes
3abc9d98c9
am 00964912
: Update to tzdata2011k.
...
* commit '00964912745f0bb7e081f84ddcc74940f973149f':
Update to tzdata2011k.
2011-09-26 11:23:50 -07:00
Elliott Hughes
0096491274
Update to tzdata2011k.
...
Affects Palestine, Gaza, Hebron, Belarus, Ukraine, and "Russia".
Change-Id: Ib17f848c3b0e86d0bfcf289c4c4a3ae53dd2f8c4
2011-09-26 10:53:50 -07:00
The Android Automerger
0c7245213d
merge in ics-release history after reset to master
2011-09-25 06:59:15 -07:00
Robert Greenwalt
3ec1bd2c7a
am 924c8785
: am 8af58f0f
: Use framework hints to determine dns query type.
...
* commit '924c8785f0b0822ab23a8a8917d312b7c5f63243':
Use framework hints to determine dns query type.
2011-09-22 23:44:57 -07:00
Robert Greenwalt
924c8785f0
am 8af58f0f
: Use framework hints to determine dns query type.
...
* commit '8af58f0fd4ff3fb11cb8a3c61e4654e3633906a4':
Use framework hints to determine dns query type.
2011-09-22 23:39:54 -07:00
Robert Greenwalt
8af58f0fd4
Use framework hints to determine dns query type.
...
Instead of checking for IPv4 or IPv6 connectivity, try using pid-specific
hints the framework has left for us.
bug:5284168
Change-Id: Id64d48db3900865a7d58ada8309870c63d6eab12
2011-09-22 11:43:06 -07:00
The Android Automerger
d98f3e9f71
merge in ics-release history after reset to master
2011-09-18 06:59:17 -07:00
JP Abgrall
26bee12899
am 77160041
: am 3884bfe9
: libc: popen: work around data corruption
...
* commit '771600415f41b9075b83dcf1e5395d2292ea05b2':
libc: popen: work around data corruption
2011-09-17 16:33:55 -07:00
JP Abgrall
771600415f
am 3884bfe9
: libc: popen: work around data corruption
...
* commit '3884bfe9661955543ce203c60f9225bbdf33f6bb':
libc: popen: work around data corruption
2011-09-17 16:32:00 -07:00
JP Abgrall
3884bfe966
libc: popen: work around data corruption
...
vfork() would not save the registers that the parent would expect
to have restored after execl() completed.
Specially that execl() would call execve() underneath, further messing
up the stack of the parent.
To avoid that, we fork() for now. Later we will revisit and cleanup
vfork()+execve() to actually have vfork() store all the register
that the parent expects to see, and not those left by execve().
In the original code, looking at the registers just before the call to
popen(), and after the call showed that r7 would get clobbered.
This would leave the caller with an invalid pointer, leading to all
kinds of data corruptions.
execve() is simpler that execl() in this case.
Bug: 5336252
Change-Id: I3bf718c0bb4c0439f6f2753f153cdea14175be9c
2011-09-17 15:22:21 -07:00
Glenn Kasten
370bbc5dea
am d53cae0e
: Add non-NDK internal API __pthread_gettid
...
* commit 'd53cae0e45dafdb3a83ccc3675051c0aee532111':
Add non-NDK internal API __pthread_gettid
2011-09-16 14:45:24 -07:00
Glenn Kasten
d53cae0e45
Add non-NDK internal API __pthread_gettid
...
Tracking bugs 5267571 and 5090073 (for deadlock detection logs).
Change-Id: Icb90f91ec1525607551c2234ef921bf88296484f
2011-09-16 12:38:28 -07:00
The Android Automerger
6e47ab1345
merge in ics-release history after reset to master
2011-09-15 06:33:15 -07:00
Erik Gilling
d0e629a68e
am b8ef90d6
: update linux/fb.h
...
* commit 'b8ef90d67950c5d4e04f95c30e164e924f41f70a':
update linux/fb.h
2011-09-14 12:08:54 -07:00
Erik Gilling
b8ef90d679
update linux/fb.h
...
Change-Id: Ib00343e3b6f95eaf3d347d4b8b9df950d0686e70
Signed-off-by: Erik Gilling <konkers@android.com>
2011-09-14 11:20:23 -07:00
The Android Automerger
ae25dc08c1
merge in ics-release history after reset to master
2011-09-13 06:33:13 -07:00
Elliott Hughes
268bec521c
am 5da3ed17
: Merge "Update to tzdata2011j."
...
* commit '5da3ed177c52cdd8344b86f9b95b08b6aa473210':
Update to tzdata2011j.
2011-09-12 11:22:57 -07:00
Elliott Hughes
5da3ed177c
Merge "Update to tzdata2011j."
2011-09-12 11:19:51 -07:00
Elliott Hughes
6ea19d7815
Update to tzdata2011j.
...
Affects Samoa, Kenya, Uganda, and Tanzania.
Change-Id: Ibee638d415d4f0389ff27ea1c9c481543e181f1f
2011-09-12 10:28:11 -07:00
Erik Gilling
6ce10804d5
update kernel video/dsscomp.h
...
Change-Id: Ifc4f96e3a9c3435c0b0ee80ac9da295b4e9463a1
Signed-off-by: Erik Gilling <konkers@android.com>
2011-09-07 17:49:09 -07:00
Erik Gilling
fa6128ad17
am 763230ae
: update kernel video/dsscomp.h
...
* commit '763230ae5509da3ec83cde5bf6ce54dd728a0adf':
update kernel video/dsscomp.h
2011-09-07 12:55:18 -07:00
Erik Gilling
763230ae55
update kernel video/dsscomp.h
...
Change-Id: Ifc4f96e3a9c3435c0b0ee80ac9da295b4e9463a1
Signed-off-by: Erik Gilling <konkers@android.com>
2011-09-07 12:53:22 -07:00
The Android Automerger
81a6894b0a
merge in ics-release history after reset to master
2011-09-05 06:33:11 -07:00
Robert Greenwalt
2d461c7c00
am 7f84da69
: Add some logging of dns cache operations
...
* commit '7f84da69f86ed9daf610c8d1129392ba3f7c4405':
Add some logging of dns cache operations
2011-09-02 13:03:41 -07:00
Robert Greenwalt
7f84da69f8
Add some logging of dns cache operations
...
Added info about what entries are getting flushed due to ttl or size limits.
Change-Id: I69fb70ce23b5b820f5f1a5738c0f1aa57b6a1127
2011-09-02 07:44:36 -07:00
The Android Automerger
94387eae69
merge in ics-release history after reset to master
2011-08-31 06:33:08 -07:00
The Android Automerger
918ad3ecfd
merge in ics-release history after reset to master
2011-08-30 13:42:36 -07:00
The Android Automerger
fd3fc8bd27
merge in ics-release history after reset to master
2011-08-30 12:45:01 -07:00