OSDN Git Service
The Android Automerger [Fri, 30 Sep 2011 13:44:15 +0000 (06:44 -0700)]
merge in ics-release history after reset to master
David 'Digit' Turner [Fri, 30 Sep 2011 04:09:08 +0000 (21:09 -0700)]
am
32ca348e: am
ce0d646c: resolved conflicts for merge of
6cda7b62 to gingerbread-plus-aosp
* commit '
32ca348eecb114b9b2a9393f178c82310f590ddb':
Bionic: x86: Fix libm macro definitions
David 'Digit' Turner [Fri, 30 Sep 2011 04:03:00 +0000 (21:03 -0700)]
am
ce0d646c: resolved conflicts for merge of
6cda7b62 to gingerbread-plus-aosp
* commit '
ce0d646cc0beb6b44d5429d01e51d00005264f44':
Bionic: x86: Fix libm macro definitions
David 'Digit' Turner [Fri, 30 Sep 2011 03:56:51 +0000 (05:56 +0200)]
resolved conflicts for merge of
6cda7b62 to gingerbread-plus-aosp
Change-Id: I85bd5291c2a9cd29bff538b6d5a4dcd73f85a1fd
Lorenzo Colitti [Thu, 29 Sep 2011 17:52:23 +0000 (10:52 -0700)]
Merge "Send both A and AAAA queries if all probes fail."
Lorenzo Colitti [Thu, 29 Sep 2011 17:52:16 +0000 (10:52 -0700)]
Merge "Revert "Use framework hints to determine dns query type.""
Bruce Beare [Thu, 15 Sep 2011 17:59:01 +0000 (10:59 -0700)]
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>
Lorenzo Colitti [Thu, 29 Sep 2011 02:47:38 +0000 (19:47 -0700)]
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
Lorenzo Colitti [Thu, 29 Sep 2011 02:28:32 +0000 (19:28 -0700)]
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
The Android Automerger [Thu, 29 Sep 2011 00:56:54 +0000 (17:56 -0700)]
merge in ics-release history after reset to master
Mathias Agopian [Wed, 28 Sep 2011 05:30:19 +0000 (22:30 -0700)]
fix prototype of dladdr
this breaks C++ source code in particular.
Change-Id: Ie06b5d31d23b5455e6950c470adc64dd5e7784df
The Android Automerger [Tue, 27 Sep 2011 13:59:11 +0000 (06:59 -0700)]
merge in ics-release history after reset to master
Elliott Hughes [Mon, 26 Sep 2011 17:53:50 +0000 (10:53 -0700)]
Update to tzdata2011k.
Affects Palestine, Gaza, Hebron, Belarus, Ukraine, and "Russia".
Change-Id: Ib17f848c3b0e86d0bfcf289c4c4a3ae53dd2f8c4
The Android Automerger [Sun, 25 Sep 2011 13:59:15 +0000 (06:59 -0700)]
merge in ics-release history after reset to master
Robert Greenwalt [Fri, 23 Sep 2011 06:39:54 +0000 (23:39 -0700)]
am
8af58f0f: Use framework hints to determine dns query type.
* commit '
8af58f0fd4ff3fb11cb8a3c61e4654e3633906a4':
Use framework hints to determine dns query type.
Robert Greenwalt [Wed, 14 Sep 2011 00:33:52 +0000 (17:33 -0700)]
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
The Android Automerger [Sun, 18 Sep 2011 13:59:17 +0000 (06:59 -0700)]
merge in ics-release history after reset to master
JP Abgrall [Sat, 17 Sep 2011 23:32:00 +0000 (16:32 -0700)]
am
3884bfe9: libc: popen: work around data corruption
* commit '
3884bfe9661955543ce203c60f9225bbdf33f6bb':
libc: popen: work around data corruption
JP Abgrall [Sat, 17 Sep 2011 22:22:21 +0000 (15:22 -0700)]
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
Glenn Kasten [Mon, 11 Jul 2011 22:41:28 +0000 (15:41 -0700)]
Add non-NDK internal API __pthread_gettid
Tracking bugs
5267571 and
5090073 (for deadlock detection logs).
Change-Id: Icb90f91ec1525607551c2234ef921bf88296484f
The Android Automerger [Thu, 15 Sep 2011 13:33:15 +0000 (06:33 -0700)]
merge in ics-release history after reset to master
Erik Gilling [Wed, 14 Sep 2011 18:20:23 +0000 (11:20 -0700)]
update linux/fb.h
Change-Id: Ib00343e3b6f95eaf3d347d4b8b9df950d0686e70
Signed-off-by: Erik Gilling <konkers@android.com>
The Android Automerger [Tue, 13 Sep 2011 13:33:13 +0000 (06:33 -0700)]
merge in ics-release history after reset to master
Elliott Hughes [Mon, 12 Sep 2011 18:19:51 +0000 (11:19 -0700)]
Merge "Update to tzdata2011j."
Elliott Hughes [Mon, 12 Sep 2011 17:28:11 +0000 (10:28 -0700)]
Update to tzdata2011j.
Affects Samoa, Kenya, Uganda, and Tanzania.
Change-Id: Ibee638d415d4f0389ff27ea1c9c481543e181f1f
Erik Gilling [Wed, 7 Sep 2011 19:53:22 +0000 (12:53 -0700)]
update kernel video/dsscomp.h
Change-Id: Ifc4f96e3a9c3435c0b0ee80ac9da295b4e9463a1
Signed-off-by: Erik Gilling <konkers@android.com>
Erik Gilling [Wed, 7 Sep 2011 19:53:22 +0000 (12:53 -0700)]
update kernel video/dsscomp.h
Change-Id: Ifc4f96e3a9c3435c0b0ee80ac9da295b4e9463a1
Signed-off-by: Erik Gilling <konkers@android.com>
The Android Automerger [Mon, 5 Sep 2011 13:33:11 +0000 (06:33 -0700)]
merge in ics-release history after reset to master
Robert Greenwalt [Fri, 2 Sep 2011 14:44:36 +0000 (07:44 -0700)]
Add some logging of dns cache operations
Added info about what entries are getting flushed due to ttl or size limits.
Change-Id: I69fb70ce23b5b820f5f1a5738c0f1aa57b6a1127
The Android Automerger [Wed, 31 Aug 2011 13:33:08 +0000 (06:33 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Tue, 30 Aug 2011 20:42:36 +0000 (13:42 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Tue, 30 Aug 2011 19:45:01 +0000 (12:45 -0700)]
merge in ics-release history after reset to master
David 'Digit' Turner [Tue, 30 Aug 2011 16:50:54 +0000 (09:50 -0700)]
am
91966c30: am
0acdbe08: am
89ea107d: Merge "linker: allow debugging of constructors"
* commit '
91966c30efbdc7feecd6c45a46ab488e715c0a35':
linker: allow debugging of constructors
David 'Digit' Turner [Tue, 30 Aug 2011 16:50:52 +0000 (09:50 -0700)]
am
35aebd36: am
c7f5c8e2: am
0f7d9df1: Merge "libc: fix typo in kernel helper script"
* commit '
35aebd36c771f32656996b02595fad8953f29916':
libc: fix typo in kernel helper script
David 'Digit' Turner [Tue, 30 Aug 2011 01:01:05 +0000 (18:01 -0700)]
am
0acdbe08: am
89ea107d: Merge "linker: allow debugging of constructors"
* commit '
0acdbe0892105d01a38de9baf4e34eef22b8259c':
linker: allow debugging of constructors
David 'Digit' Turner [Tue, 30 Aug 2011 01:01:04 +0000 (18:01 -0700)]
am
c7f5c8e2: am
0f7d9df1: Merge "libc: fix typo in kernel helper script"
* commit '
c7f5c8e2703c1dbeabe54d408b8819f97ef623f3':
libc: fix typo in kernel helper script
David 'Digit' Turner [Tue, 30 Aug 2011 00:57:59 +0000 (17:57 -0700)]
am
89ea107d: Merge "linker: allow debugging of constructors"
* commit '
89ea107de51baaccb7ada150d1192b80c6faa642':
linker: allow debugging of constructors
David 'Digit' Turner [Tue, 30 Aug 2011 00:57:57 +0000 (17:57 -0700)]
am
0f7d9df1: Merge "libc: fix typo in kernel helper script"
* commit '
0f7d9df17f2f5a355b1b799a70219c18587482a6':
libc: fix typo in kernel helper script
Nick Kralevich [Mon, 29 Aug 2011 20:49:22 +0000 (13:49 -0700)]
linker.h: don't change the soinfo structure
In
48527c3f740a80b45acb5a6efc217f771ae50143, we modified the soinfo
structure to remove an unnecessary variable. However, third party
programs seem to be relying on the structure not changing.
Add a dummy variable back into place to preserve structure.
Bug:
5064106
Change-Id: I3014dda1a46e624644b09e156c3e9381ba3729bd
Elliott Hughes [Mon, 29 Aug 2011 15:58:09 +0000 (08:58 -0700)]
Update to tzdata2011i.
Affects South Sudan (Africa/Juba), Samoa, Europe/Kalingrad, Newfoundland,
America/Resolute, Metlakatla, America/Honolulu, America/Goose_Bay and
America/St_Johns.
Change-Id: I8e60a7c7ba5ab71eedcc66937443a9e6993accd6
David 'Digit' Turner [Mon, 29 Aug 2011 11:33:07 +0000 (04:33 -0700)]
Merge "linker: allow debugging of constructors"
David 'Digit' Turner [Sun, 28 Aug 2011 07:33:42 +0000 (00:33 -0700)]
Merge "libc: fix typo in kernel helper script"
David 'Digit' Turner [Wed, 1 Jun 2011 08:27:04 +0000 (10:27 +0200)]
libc: fix typo in kernel helper script
Change-Id: I3b75b1323cf7a48cb839dede1552f24711847335
David 'Digit' Turner [Sat, 27 Aug 2011 08:21:01 +0000 (10:21 +0200)]
linker: allow debugging of constructors
This patch allows the debugging of constructors in shared
libraries and executables. It does so by ensuring that the
corresponding binary is visible to gdb before running the
constructors.
Change-Id: I0a3df726a04ad109944c834dcbba672b85d3991e
Erik Gilling [Wed, 24 Aug 2011 22:01:13 +0000 (15:01 -0700)]
Merge "update video/dsscomp.h"
Erik Gilling [Wed, 24 Aug 2011 20:33:13 +0000 (13:33 -0700)]
update video/dsscomp.h
Change-Id: If4bd1d751b30ad2e65c0bd83caba436334949463
Signed-off-by: Erik Gilling <konkers@android.com>
Mike Lockwood [Tue, 23 Aug 2011 14:29:30 +0000 (10:29 -0400)]
Add linux/leds-an30259a.h
Change-Id: I9144b58bdc522d6ec22466adc459a40be648592f
Signed-off-by: Mike Lockwood <lockwood@android.com>
David 'Digit' Turner [Mon, 22 Aug 2011 17:50:51 +0000 (19:50 +0200)]
libc: Add __aeabi_f2uiz to libgcc_compat.c
This patch ensure that __aeabi_f2uiz is embedded in our C library.
This is needed to avoid breaking certain applications when they are
loaded in ICS. It is likely that the issue is due to mis-linked
binaries generated with the stand-alone toolchain (the problem
should not exist if you use ndk-build), but this fix is easier
than asking all app developers to fix their custom build system.
If you want more technical details, read the comments inside
libgcc_compat.c
Change-Id: I59ac1fc781ecb70b90b5573c5a3c67560ca8f270
Jing Yu [Tue, 16 Aug 2011 23:14:34 +0000 (16:14 -0700)]
Disable sincos optimization for sincos calls.
sincos() functions would be turned into infinite calls to
itself if sincos optimization is applied to itself. See
gcc bugzilla http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46926
arm-linux-androideabi-4.4.3 toolchain does not have this problem
because sincos optimization is entirely disabled. Starting
from arm-linux-androideabi-4.6 toolchain, we enable sincos optimization
in gcc.
This patch simply enforce -O0 on this function to minimize the
change.
Change-Id: I0fc00b5f1dd71c0a024943bdedfed29b0d195e82
David Turner [Tue, 9 Aug 2011 20:37:30 +0000 (13:37 -0700)]
am
3dc94305: am
17a40ffb: am
c57fd963: Merge "NDK: x86 header file has incorrect definition for ptrdiff_t"
* commit '
3dc94305e4eb243747248b43954c499ddc96638d':
NDK: x86 header file has incorrect definition for ptrdiff_t
David Turner [Tue, 9 Aug 2011 20:37:21 +0000 (13:37 -0700)]
am
951e8381: am
3906a9c1: am
f5aa1382: Merge "x86 libc: Fix the range to check the error"
* commit '
951e8381916464243c7601fdb41e941811aa3773':
x86 libc: Fix the range to check the error
Andy McFadden [Fri, 5 Aug 2011 22:02:50 +0000 (15:02 -0700)]
Merge "Log signal info at time of receipt"
David Turner [Fri, 5 Aug 2011 16:42:57 +0000 (09:42 -0700)]
am
17a40ffb: am
c57fd963: Merge "NDK: x86 header file has incorrect definition for ptrdiff_t"
* commit '
17a40ffbf0e12ee44a024a9bb37434388478b478':
NDK: x86 header file has incorrect definition for ptrdiff_t
David Turner [Fri, 5 Aug 2011 16:41:22 +0000 (09:41 -0700)]
am
c57fd963: Merge "NDK: x86 header file has incorrect definition for ptrdiff_t"
* commit '
c57fd963817afa8894af49d6c98a80d8f9100937':
NDK: x86 header file has incorrect definition for ptrdiff_t
David Turner [Fri, 5 Aug 2011 16:23:29 +0000 (09:23 -0700)]
Merge "NDK: x86 header file has incorrect definition for ptrdiff_t"
Mark D Horn [Fri, 5 Aug 2011 00:09:39 +0000 (17:09 -0700)]
NDK: x86 header file has incorrect definition for ptrdiff_t
See Bug http://code.google.com/p/android/issues/detail?id=19042
Change-Id: I8e975930e7f8c3c437ecdffbc6f6bc5028937829
Signed-off-by: Mark D Horn <mark.d.horn@intel.com>
David Turner [Fri, 5 Aug 2011 15:25:35 +0000 (08:25 -0700)]
am
3906a9c1: am
f5aa1382: Merge "x86 libc: Fix the range to check the error"
* commit '
3906a9c16b971c2689e1b8ae5455feec8cf7353c':
x86 libc: Fix the range to check the error
David Turner [Fri, 5 Aug 2011 15:24:22 +0000 (08:24 -0700)]
am
f5aa1382: Merge "x86 libc: Fix the range to check the error"
* commit '
f5aa1382ec7592c58827ed0822c77cb5bf8df165':
x86 libc: Fix the range to check the error
David Turner [Fri, 5 Aug 2011 15:08:57 +0000 (08:08 -0700)]
Merge "x86 libc: Fix the range to check the error"
Iliyan Malchev [Thu, 4 Aug 2011 22:41:25 +0000 (15:41 -0700)]
bionic: update sanitized kernel header dsscomp.h
Change-Id: I3d52beb97efd23000b76131b6049978546571754
Signed-off-by: Iliyan Malchev <malchev@google.com>
Andy McFadden [Fri, 29 Jul 2011 19:46:34 +0000 (12:46 -0700)]
Log signal info at time of receipt
When a fatal signal is received, we now write a message to the log
that looks like this:
F/libc ( 1540): Fatal signal 11 (SIGSEGV) at 0xdeadd00d (code=1)
This is useful for debugging fatal signals that turn out not to be
fatal. This also changes the signal reset from SIG_IGN to SIG_DFL,
so that future non-fatal fatal signals are fatal.
The code that blocked SIGUSR1 to avoid being interrupted by the GC
has been removed.
Also, fix minor issues in format_buffer().
Bug
5035703
Change-Id: I8940af47297b5dcf3cf33537e3483ca5334ed565
David 'Digit' Turner [Thu, 4 Aug 2011 18:17:11 +0000 (11:17 -0700)]
am
a64990f3: am
f03fb955: am
023c4988: Merge "libc: x86: Fixed size_t definition."
* commit '
a64990f3f25c45fcfe79b9b71cf54d7045af0e4f':
libc: x86: Fixed size_t definition.
David 'Digit' Turner [Thu, 4 Aug 2011 18:13:10 +0000 (11:13 -0700)]
am
f03fb955: am
023c4988: Merge "libc: x86: Fixed size_t definition."
* commit '
f03fb955a92bdcc341aaa1b4a6eb2d81bc844e06':
libc: x86: Fixed size_t definition.
David 'Digit' Turner [Thu, 4 Aug 2011 18:09:34 +0000 (11:09 -0700)]
am
023c4988: Merge "libc: x86: Fixed size_t definition."
* commit '
023c49882e247bd0345946c908cff231ebf7097e':
libc: x86: Fixed size_t definition.
David 'Digit' Turner [Thu, 4 Aug 2011 18:01:13 +0000 (11:01 -0700)]
Merge "libc: x86: Fixed size_t definition."
David 'Digit' Turner [Thu, 4 Aug 2011 12:07:00 +0000 (14:07 +0200)]
libc: x86: Fixed size_t definition.
This patch changes the declaration of size_t on x86 targets
to test for the __ANDROID__ macro, instead of ANDROID
__ANDROID__ should be a builting toolchain macro, while ANDROID
is usually added manually during the build.
Testing against __ANDROID__ allows us to use the header when
using the NDK's standalone x86 toolchain.
This is related to http://code.google.com/p/android/issues/detail?id=19011
The bug was already fixed in the NDK platform headers, this simply updates
the C library one accordingly.
Change-Id: Ie038c4c8b37b7d24e2e4ae4d7a63371b69c9a51e
Iliyan Malchev [Thu, 4 Aug 2011 03:59:19 +0000 (20:59 -0700)]
bionic: add clean kernel header dsscomp.h
Change-Id: I09a98d0abe8ff4f92058f90ffb80ddc19ccee076
Signed-off-by: Iliyan Malchev <malchev@google.com>
Iliyan Malchev [Wed, 3 Aug 2011 23:41:10 +0000 (16:41 -0700)]
bionic: add processed kernel header rpmsg_omx.h
Change-Id: Id07ad37dd464d859cebdf72b68e6fb16d5e91c0f
Signed-off-by: Iliyan Malchev <malchev@google.com>
David Turner [Thu, 4 Aug 2011 00:42:41 +0000 (17:42 -0700)]
am
bc9d1fe7: am
4685acbd: am
9efda5b7: Merge "typo in libc/stdio/wcio.h"
* commit '
bc9d1fe7c467d861a2b7c1deafca5589c1bc309e':
typo in libc/stdio/wcio.h
David Turner [Wed, 3 Aug 2011 15:16:37 +0000 (08:16 -0700)]
am
4685acbd: am
9efda5b7: Merge "typo in libc/stdio/wcio.h"
* commit '
4685acbdd45c44e2e21c74242953bee5198209f9':
typo in libc/stdio/wcio.h
David Turner [Wed, 3 Aug 2011 15:14:52 +0000 (08:14 -0700)]
am
9efda5b7: Merge "typo in libc/stdio/wcio.h"
* commit '
9efda5b7d0a2e8d9dc7495680d66085dc0e151f3':
typo in libc/stdio/wcio.h
David Turner [Wed, 3 Aug 2011 15:10:29 +0000 (08:10 -0700)]
Merge "typo in libc/stdio/wcio.h"
Robert Greenwalt [Fri, 29 Jul 2011 19:30:33 +0000 (12:30 -0700)]
am
663e0579: am
dfec555c: am
bcf861f2: Merge "Don\'t call freeaddrinfo with a NULL ptr."
* commit '
663e05797f9bb2463217055a2510063ea7977379':
Don't call freeaddrinfo with a NULL ptr.
Robert Greenwalt [Fri, 29 Jul 2011 18:27:00 +0000 (11:27 -0700)]
am
dfec555c: am
bcf861f2: Merge "Don\'t call freeaddrinfo with a NULL ptr."
* commit '
dfec555c7f1c25f42be209e9027ee47eabe0a7a4':
Don't call freeaddrinfo with a NULL ptr.
Robert Greenwalt [Fri, 29 Jul 2011 17:15:21 +0000 (10:15 -0700)]
am
bcf861f2: Merge "Don\'t call freeaddrinfo with a NULL ptr."
* commit '
bcf861f246bb06ebba2c070af5b3222c5254970d':
Don't call freeaddrinfo with a NULL ptr.
Robert Greenwalt [Fri, 29 Jul 2011 17:00:39 +0000 (10:00 -0700)]
Merge "Don't call freeaddrinfo with a NULL ptr."
Robert Greenwalt [Fri, 29 Jul 2011 00:21:17 +0000 (17:21 -0700)]
Don't call freeaddrinfo with a NULL ptr.
bug:
5067055
Change-Id: I863dc4760a0aa449ac6298397ed571d8d9287801
JP Abgrall [Wed, 27 Jul 2011 16:24:36 +0000 (09:24 -0700)]
am
4e5f0d41: (-s ours) am
821bea02: Merge "DO NOT MERGE: libc: enable IPTOS_MINCOST, fixup gethostbyaddr() proto." into honeycomb-LTE
* commit '
4e5f0d41f6e239730bbd70b9a8512949bdfe01d9':
DO NOT MERGE: libc: enable IPTOS_MINCOST, fixup gethostbyaddr() proto.
JP Abgrall [Wed, 27 Jul 2011 16:24:34 +0000 (09:24 -0700)]
am
cec4e990: (-s ours) am
30517a93: Merge "DO NOT MERGE: Update netlink-related kernel includes" into honeycomb-LTE
* commit '
cec4e990d8f5cbf65f1f2a40b771ec476fb7914d':
DO NOT MERGE: Update netlink-related kernel includes
Robert Greenwalt [Wed, 27 Jul 2011 16:22:56 +0000 (09:22 -0700)]
am
0cb2d467: resolved conflicts for merge of
9363d912 to honeycomb-plus-aosp
* commit '
0cb2d467de28ae60a375404b08ae9a83aaa9305a':
JP Abgrall [Wed, 27 Jul 2011 16:20:51 +0000 (09:20 -0700)]
am
821bea02: Merge "DO NOT MERGE: libc: enable IPTOS_MINCOST, fixup gethostbyaddr() proto." into honeycomb-LTE
* commit '
821bea0266810e546a842582b0e29a9bfd5223d9':
DO NOT MERGE: libc: enable IPTOS_MINCOST, fixup gethostbyaddr() proto.
JP Abgrall [Wed, 27 Jul 2011 16:20:50 +0000 (09:20 -0700)]
am
30517a93: Merge "DO NOT MERGE: Update netlink-related kernel includes" into honeycomb-LTE
* commit '
30517a9344a8ac06b6962bfb24bb33463767307e':
DO NOT MERGE: Update netlink-related kernel includes
Robert Greenwalt [Wed, 27 Jul 2011 16:18:54 +0000 (09:18 -0700)]
resolved conflicts for merge of
9363d912 to honeycomb-plus-aosp
Change-Id: Ib0680d7e0be34ae656a9675ddd1014a6193a4006
JP Abgrall [Wed, 27 Jul 2011 01:40:04 +0000 (18:40 -0700)]
Merge "DO NOT MERGE: libc: enable IPTOS_MINCOST, fixup gethostbyaddr() proto." into honeycomb-LTE
JP Abgrall [Wed, 27 Jul 2011 01:39:56 +0000 (18:39 -0700)]
Merge "DO NOT MERGE: Update netlink-related kernel includes" into honeycomb-LTE
Robert Greenwalt [Tue, 26 Jul 2011 23:18:52 +0000 (16:18 -0700)]
resolved conflicts for merge of
9363d912 to honeycomb-plus-aosp
Change-Id: I555f5c10da9770feacdbece9fd77729d6151bfba
Robert Greenwalt [Mon, 25 Jul 2011 19:30:17 +0000 (12:30 -0700)]
Add per-interface dns caches.
import of changes 22100 and 23138 from opensource.
Change-Id: I3ce86394323d269272aeb2bebeed4374f171a8cf
JP Abgrall [Wed, 18 May 2011 23:53:23 +0000 (16:53 -0700)]
DO NOT MERGE: libc: enable IPTOS_MINCOST, fixup gethostbyaddr() proto.
DO NOT MERGE: pulled in from master for iptables v1.4.11 update
Make netinet/ip.h have IPTOS_MINCOST which matches what
kernel/common/linux/ip.h has to say.
Fixup gethostbyaddr() 1st arg to match what man has to say.
Change-Id: Iff9647d4a46ea88b1fc32163eb69bb9b27cdf370
Dmitry Shmidt [Tue, 22 Mar 2011 22:21:48 +0000 (15:21 -0700)]
DO NOT MERGE: Update netlink-related kernel includes
DO NOT MERGE: pulled in from master for iptables v1.4.11 update
Change-Id: I7e41bb168a1036093b598383d663a6a2e036ea42
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Mike Lockwood [Thu, 21 Jul 2011 20:51:30 +0000 (13:51 -0700)]
f_accessory.h: Update USB accessory kernel driver header file
Bug:
5051683
Change-Id: I24fb640f24439f0010735eaa8e1e7b2767c353ea
Signed-off-by: Mike Lockwood <lockwood@android.com>
Robert Greenwalt [Thu, 21 Jul 2011 00:20:03 +0000 (17:20 -0700)]
am
fed31359: am
f6fcdb2e: am
28de3e59: Merge "Don\'t reset caches when dns props change."
* commit '
fed3135972f9725a44a7d9b3df728e311ac1a130':
Don't reset caches when dns props change.
Robert Greenwalt [Thu, 21 Jul 2011 00:16:37 +0000 (17:16 -0700)]
am
f6fcdb2e: am
28de3e59: Merge "Don\'t reset caches when dns props change."
* commit '
f6fcdb2edd522de75811c7ccd23e74677bda6856':
Don't reset caches when dns props change.
Robert Greenwalt [Wed, 20 Jul 2011 22:49:50 +0000 (15:49 -0700)]
am
28de3e59: Merge "Don\'t reset caches when dns props change."
* commit '
28de3e5901fd54208f20e027365d2ba7b7e136b6':
Don't reset caches when dns props change.
Robert Greenwalt [Wed, 20 Jul 2011 22:39:28 +0000 (15:39 -0700)]
Merge "Don't reset caches when dns props change."
Mattias Falk [Mon, 4 Apr 2011 14:12:35 +0000 (16:12 +0200)]
Don't reset caches when dns props change.
This happens too frequently. We should flush a per-interface cache
when it's dns server addrs changes.
Change-Id: I8a691c96ce9a775160ef55ddb8f755d649041583
Chia-chi Yeh [Mon, 18 Jul 2011 19:00:23 +0000 (12:00 -0700)]
update VPN related kernel headers to 2.6.39.
The original files are updated in I84220a16b667082f4ff75e72c6b0f2f0dddb65df.
Change-Id: I14ca73b79c66427fd2ad58fb54a5ac649c9b7eee
Shih-wei Liao [Sun, 17 Jul 2011 19:32:43 +0000 (12:32 -0700)]
Revert "Revert "linker: get rid of the buddy allocator""
This reverts commit
f9a9cda23a6afc1c2dfdfd624cde23b61941eb5e.
This revert is promised once b/
5039224, b/
5036755, b/
5036610 are resolved.
Mike Lockwood [Sat, 16 Jul 2011 13:11:23 +0000 (06:11 -0700)]
Merge "f_mtp.h: Update for MTP_SEND_FILE_WITH_HEADER ioctl"
Nick Kralevich [Fri, 15 Jul 2011 23:12:45 +0000 (16:12 -0700)]
Revert "linker: get rid of the buddy allocator"
This reverts commit
7059b1f02ea9197728c851edd9ae0dd7688fa700.
Bug:
5036610
Mike Lockwood [Fri, 15 Jul 2011 01:02:30 +0000 (21:02 -0400)]
f_mtp.h: Update for MTP_SEND_FILE_WITH_HEADER ioctl
Change-Id: Ib5541625998805cbc23f34eb00f5a21cba6eef53
Signed-off-by: Mike Lockwood <lockwood@android.com>