Jean-Baptiste Queru
327b2b709f
Merge "move core audio definitions under system/core"
2011-05-13 10:11:17 -07:00
Dima Zavin
253b598dc0
move core audio definitions under system/core
...
Change-Id: I58b7324edff834b3afa4d9c86452e66f8c29c63b
Signed-off-by: Dima Zavin <dima@android.com>
2011-05-13 08:46:13 -07:00
Irfan Sheriff
37737d8386
am d4f87e71
: am 91a9b452
: DO NOT MERGE DHCP changes from master
...
* commit 'd4f87e718d2b72c302bf641c5ed7fa7b7f3ca951':
DO NOT MERGE DHCP changes from master
2011-05-12 17:39:15 -07:00
Irfan Sheriff
d4f87e718d
am 91a9b452
: DO NOT MERGE DHCP changes from master
...
* commit '91a9b452152f3c147f5356f0d2f503a664bd2a46':
DO NOT MERGE DHCP changes from master
2011-05-12 17:35:18 -07:00
Jean-Baptiste Queru
34df17d032
am 7078f776
: Merge "cutils: add popcount/popcountl/popcountll static inline definitions"
...
* commit '7078f776fd658f86ecb249eeffc6e7cb0c4ae66a':
cutils: add popcount/popcountl/popcountll static inline definitions
2011-05-12 10:44:52 -07:00
Jean-Baptiste Queru
7078f776fd
Merge "cutils: add popcount/popcountl/popcountll static inline definitions"
2011-05-12 10:28:08 -07:00
Dima Zavin
4af1cf2bd7
cutils: add popcount/popcountl/popcountll static inline definitions
...
Just pass them through to their specific GCC builtins. If we find
that the builtins are not performing well or have other issues, we can
pull in existing public implementations and/or write arch-specific
helpers if necessary.
Change-Id: I278e6b73d75fac88808ed4546070d288c06f79e0
Signed-off-by: Dima Zavin <dima@android.com>
2011-05-12 08:41:49 -07:00
Irfan Sheriff
91a9b45215
DO NOT MERGE DHCP changes from master
...
Pick dhcp changes from master for the renewal fixes
Bug: 3344732
Change-Id: I42596513f3ef936ef7160d954e3bd26bc51662c8
2011-05-06 16:16:51 -07:00
Irfan Sheriff
c951695ede
am 3746be26
: DHCP changes from master
...
* commit '3746be268c1b70ebbf0dee6ed21b7efb479414c9':
DHCP changes from master
2011-05-02 12:03:12 -07:00
Irfan Sheriff
3746be268c
DHCP changes from master
...
Pick dhcp changes from master for the renewal fixes
Bug: 3344732
Change-Id: Ie49cd11f74cf89e9edf2d1c788a699ce0996190d
2011-04-30 12:59:51 -07:00
Nick Kralevich
943ae2ceb7
am fe6bfb12
: am a8728ee0
: (-s ours) Merge "libsysutils: only accept uevents from the kernel."
...
* commit 'fe6bfb1285f8c784e0700d03f0f3657ba126e6c4':
libsysutils: only accept uevents from the kernel.
2011-04-29 14:54:40 -07:00
David 'Digit' Turner
7db617efc0
resolved conflicts for merge of b013bfc1
to honeycomb-plus-aosp
...
Change-Id: I159dd58c403bc38f9637163d8cd5e6270e4f201c
2011-04-29 13:31:31 +02:00
Nick Kralevich
fe6bfb1285
am a8728ee0
: (-s ours) Merge "libsysutils: only accept uevents from the kernel."
...
* commit 'a8728ee0f2e7927d7300a673946926ff82dd8ef3':
libsysutils: only accept uevents from the kernel.
2011-04-28 11:21:17 -07:00
Nick Kralevich
a8728ee0f2
Merge "libsysutils: only accept uevents from the kernel."
2011-04-28 10:58:34 -07:00
David 'Digit' Turner
b013bfc171
am 52a64057
: Merge "ueventd.rc: Move /dev/qemu_trace to ueventd.goldfish.rc"
...
* commit '52a64057b60b0ad242e95fdc285ec60e0191d5b5':
ueventd.rc: Move /dev/qemu_trace to ueventd.goldfish.rc
2011-04-28 02:30:33 -07:00
David 'Digit' Turner
52a64057b6
Merge "ueventd.rc: Move /dev/qemu_trace to ueventd.goldfish.rc"
2011-04-28 02:20:17 -07:00
Nick Kralevich
b0d0e260bd
resolved conflicts for merge of 2baeb898
to honeycomb-plus-aosp
...
Change-Id: Ib3169b3a36aa13ef413da624355b1737e9b76fd9
2011-04-27 13:09:24 -07:00
Nick Kralevich
2baeb89882
am a2842b68
: Merge "Fold uevent message origin checking from init into libcutils."
...
* commit 'a2842b68548c8cdfbf6b3c14480ab04bab9010ea':
Fold uevent message origin checking from init into libcutils.
2011-04-27 12:31:55 -07:00
Nick Kralevich
a2842b6854
Merge "Fold uevent message origin checking from init into libcutils."
2011-04-27 12:24:47 -07:00
Vernon Tang
80b0162910
libsysutils: only accept uevents from the kernel.
...
Addresses CVE-2011-1823.
Change-Id: I393c21da749a6a6491d6719767bc1ff3df647ebe
2011-04-28 05:16:47 +10:00
Vernon Tang
3f582e92f0
Fold uevent message origin checking from init into libcutils.
...
Change-Id: I7cbc0cb840d1b4962e6c360fdad9a9c0ce20e87b
2011-04-28 05:16:21 +10:00
Conley Owens
66acffad76
am c4eaebbe
: am ab6e55f7
: Merge "Enlarge USB bulk transfer size for faster downloads"
...
* commit 'c4eaebbe7a0c125663f74e3961b62de8d3611a51':
Enlarge USB bulk transfer size for faster downloads
2011-04-27 11:38:29 -07:00
Conley Owens
c4eaebbe7a
am ab6e55f7
: Merge "Enlarge USB bulk transfer size for faster downloads"
...
* commit 'ab6e55f72b975b4fc61c436d4540ba7416166262':
Enlarge USB bulk transfer size for faster downloads
2011-04-27 11:32:42 -07:00
Conley Owens
ab6e55f72b
Merge "Enlarge USB bulk transfer size for faster downloads"
2011-04-27 11:20:50 -07:00
Nick Kralevich
de35f2741c
am 03752be0
: am 0c297f5e
: Merge "Revert "Fold uevent message origin checking from init into libcutils.""
...
* commit '03752be0a437d12e19ac73ebe23385fe6f756e2c':
Revert "Fold uevent message origin checking from init into libcutils."
2011-04-27 10:35:06 -07:00
Nick Kralevich
03752be0a4
am 0c297f5e
: Merge "Revert "Fold uevent message origin checking from init into libcutils.""
...
* commit '0c297f5ebb5ae7af2854f7c07d97bcdd13c159fc':
Revert "Fold uevent message origin checking from init into libcutils."
2011-04-27 10:32:00 -07:00
Nick Kralevich
0c297f5ebb
Merge "Revert "Fold uevent message origin checking from init into libcutils.""
2011-04-27 10:23:46 -07:00
Nick Kralevich
de9e65dd65
Revert "Fold uevent message origin checking from init into libcutils."
...
This reverts commit 8405ec0e75
.
The original change does not compile.
2011-04-27 10:21:24 -07:00
Nick Kralevich
e3ab424570
am a7cf7ed9
: am 282c2ab4
: Merge "Fold uevent message origin checking from init into libcutils."
...
* commit 'a7cf7ed93486240ca48a407e67c7c3683a3b93aa':
Fold uevent message origin checking from init into libcutils.
2011-04-27 09:59:14 -07:00
Nick Kralevich
02c8a9cf59
am 18f6d964
: am f819d023
: Merge "libsysutils: SocketListener: handle recv errors more gracefully."
...
* commit '18f6d964cbee483106da5c96a8c067a948324da7':
libsysutils: SocketListener: handle recv errors more gracefully.
2011-04-27 09:55:31 -07:00
Nick Kralevich
a7cf7ed934
am 282c2ab4
: Merge "Fold uevent message origin checking from init into libcutils."
...
* commit '282c2ab408d487d0995362d1b9aa97fe30d97ebd':
Fold uevent message origin checking from init into libcutils.
2011-04-27 09:55:20 -07:00
Nick Kralevich
282c2ab408
Merge "Fold uevent message origin checking from init into libcutils."
2011-04-27 09:51:42 -07:00
Nick Kralevich
18f6d964cb
am f819d023
: Merge "libsysutils: SocketListener: handle recv errors more gracefully."
...
* commit 'f819d0233646668b06de36a787979e3b180d6c48':
libsysutils: SocketListener: handle recv errors more gracefully.
2011-04-27 09:40:04 -07:00
Nick Kralevich
f819d02336
Merge "libsysutils: SocketListener: handle recv errors more gracefully."
2011-04-27 09:22:38 -07:00
Vernon Tang
8405ec0e75
Fold uevent message origin checking from init into libcutils.
...
Change-Id: I1a38e611a7ad990f74306ce453740a1eeed2416d
2011-04-27 14:17:15 +10:00
Vernon Tang
8795007a4a
libsysutils: SocketListener: handle recv errors more gracefully.
...
Don't close the socket when onDataAvailable returns false if the socket
is connectionless.
Change-Id: Ie19497f5928144c463d92aa72ba517e675549ea6
2011-04-27 14:01:27 +10:00
Mike Lockwood
81ce51dae9
am 55537c34
: am 2f7995ee
: Merge "adb: fix typo in helptext"
...
* commit '55537c347bb31d0e2b176ca2550d2054877f9d54':
adb: fix typo in helptext
2011-04-26 16:00:55 -07:00
Mike Lockwood
55537c347b
am 2f7995ee
: Merge "adb: fix typo in helptext"
...
* commit '2f7995ee0ff480b4ee06e8944e7d4569b59a5bad':
adb: fix typo in helptext
2011-04-26 15:46:20 -07:00
Mike Lockwood
2f7995ee0f
Merge "adb: fix typo in helptext"
2011-04-26 13:45:10 -07:00
David 'Digit' Turner
f315896f17
am 09bd79c1
: am d068e5ae
: Merge "pixelflinger: Provide more scanline shortcut functions."
...
* commit '09bd79c1c9f66f4b77969c3ec14bf62b29911ff5':
pixelflinger: Provide more scanline shortcut functions.
2011-04-26 10:24:18 -07:00
Nick Kralevich
9285dc2511
am 4aadb7f6
: (-s ours) am b620a0b1
: Validate sender credentials on netlink msg receive
...
* commit '4aadb7f6df4fd21f66c37b8ac0ea8ebf939b41bf':
Validate sender credentials on netlink msg receive
2011-04-26 10:24:16 -07:00
David 'Digit' Turner
f431d0499b
ueventd.rc: Move /dev/qemu_trace to ueventd.goldfish.rc
...
+ Add /dev/qemu_pipe line for QEMU pipes.
Change-Id: If3c5c675bfc1585a1d6ffcd1042aaedbc2e94763
2011-04-26 18:07:45 +02:00
Bernhard Reutner-Fischer
6715a4390f
adb: fix typo in helptext
...
s/ocmmand/command
Change-Id: I4ed17e8df9dc71a28e1caef5a21f6351e92628af
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
2011-04-26 12:53:55 +02:00
David 'Digit' Turner
09bd79c1c9
am d068e5ae
: Merge "pixelflinger: Provide more scanline shortcut functions."
...
* commit 'd068e5aeb9992caa46a45275f7ff2ef73d3732a4':
pixelflinger: Provide more scanline shortcut functions.
2011-04-26 00:43:01 -07:00
David 'Digit' Turner
d068e5aeb9
Merge "pixelflinger: Provide more scanline shortcut functions."
2011-04-25 23:25:15 -07:00
Nick Kralevich
a265e5a352
am d94bbc32
: am 6bc08280
: Validate sender credentials on netlink msg receive
...
* commit 'd94bbc326ab0e9ceca6f3f90a2864e40bb584c07':
Validate sender credentials on netlink msg receive
2011-04-19 15:40:50 -07:00
Nick Kralevich
d94bbc326a
am 6bc08280
: Validate sender credentials on netlink msg receive
...
* commit '6bc08280108d020edfceff039f3955eebdc1e45c':
Validate sender credentials on netlink msg receive
2011-04-19 15:37:03 -07:00
Nick Kralevich
6bc0828010
Validate sender credentials on netlink msg receive
...
Verify that netlink messages are actually from the kernel,
and not from a userspace program.
This is a manual cherry-pick from b620a0b1c7
Change-Id: I237f0a5cb56393bb3aab64a7ae5898f2bdc95cef
2011-04-19 12:33:44 -07:00
Nick Kralevich
4aadb7f6df
am b620a0b1
: Validate sender credentials on netlink msg receive
...
* commit 'b620a0b1c7ae486e979826200e8e441605b0a5d6':
Validate sender credentials on netlink msg receive
2011-04-18 16:29:45 -07:00
Nick Kralevich
b620a0b1c7
Validate sender credentials on netlink msg receive
...
Verify that netlink messages are actually from the kernel,
and not from a userspace program.
Change-Id: I709c0efe9ba0258f6d79ebcde531d7f7bbe780b2
2011-04-18 15:55:59 -07:00