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
0c297f5ebb
Merge "Revert "Fold uevent message origin checking from init into libcutils.""
2011-04-27 10:23:46 -07:00
de9e65dd65
Revert "Fold uevent message origin checking from init into libcutils."
...
This reverts commit 8405ec0e75
2011-04-27 10:21:24 -07:00
3268eda4dc
am e3ab4245: am a7cf7ed9: am 282c2ab4: Merge "Fold uevent message origin checking from init into libcutils."
...
* commit 'e3ab42457077ec2a66bac553e59a7fee08d4fa9e':
Fold uevent message origin checking from init into libcutils.
2011-04-27 10:00:34 -07:00
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
2084da4c0f
am 02c8a9cf: am 18f6d964: am f819d023: Merge "libsysutils: SocketListener: handle recv errors more gracefully."
...
* commit '02c8a9cf594d8a074a707e06553a230a690124c4':
libsysutils: SocketListener: handle recv errors more gracefully.
2011-04-27 09:57:48 -07:00
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
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
282c2ab408
Merge "Fold uevent message origin checking from init into libcutils."
2011-04-27 09:51:42 -07:00
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
f819d02336
Merge "libsysutils: SocketListener: handle recv errors more gracefully."
2011-04-27 09:22:38 -07:00
8405ec0e75
Fold uevent message origin checking from init into libcutils.
...
Change-Id: I1a38e611a7ad990f74306ce453740a1eeed2416d
2011-04-27 14:17:15 +10:00
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
224f9485f1
am 81ce51da: am 55537c34: am 2f7995ee: Merge "adb: fix typo in helptext"
...
* commit '81ce51dae95deb0dc6b07cbd96bd07d08aad5178':
adb: fix typo in helptext
2011-04-26 16:06:04 -07:00
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
55537c347b
am 2f7995ee: Merge "adb: fix typo in helptext"
...
* commit '2f7995ee0ff480b4ee06e8944e7d4569b59a5bad':
adb: fix typo in helptext
2011-04-26 15:46:20 -07:00
2f7995ee0f
Merge "adb: fix typo in helptext"
2011-04-26 13:45:10 -07:00
8c75b8f22b
am f315896f: am 09bd79c1: am d068e5ae: Merge "pixelflinger: Provide more scanline shortcut functions."
...
* commit 'f315896f17475c293af3b2cf485d5f0bae812a88':
pixelflinger: Provide more scanline shortcut functions.
2011-04-26 12:45:41 -07:00
0c5c789d59
am 9285dc25: am 4aadb7f6: (-s ours) am b620a0b1: Validate sender credentials on netlink msg receive
...
* commit '9285dc2511e252eef00c0140b89346fb743960c8':
Validate sender credentials on netlink msg receive
2011-04-26 12:45:39 -07:00
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
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
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
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
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
d068e5aeb9
Merge "pixelflinger: Provide more scanline shortcut functions."
2011-04-25 23:25:15 -07:00
8d63e3507c
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
2011-04-25 16:18:35 -07:00
dbff9862ad
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
2011-04-21 18:40:26 -07:00
0fad7d023f
libcutils: add a simple string parameter parsing ("a=b;c=d;") helper utils
...
Change-Id: Ifabeb75550fa6e351434e6e6d036b19331daf6c1
Signed-off-by: Dima Zavin <dima@android.com>
2011-04-20 19:04:40 -07:00
6b54a6832f
am a265e5a3: am d94bbc32: am 6bc08280: Validate sender credentials on netlink msg receive
...
* commit 'a265e5a352c2f43d3229702eb215347b3f7e2047':
Validate sender credentials on netlink msg receive
2011-04-19 15:47:21 -07:00
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
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
4fab9ac04e
libcutils: hashmap: save next pointer in forEach before calling callback
...
If the callback passed to forEach tries to remove the element it was passed,
there's a use-after-free of the entry pointer in forEach.
Change-Id: Ia364b4775c9c55780b23f683b30cbff511b7f944
Signed-off-by: Dima Zavin <dima@android.com>
2011-04-19 15:16:18 -07:00
e2f246e497
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
2011-04-19 15:01:00 -07:00
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
2011-04-19 12:33:44 -07:00
c4956766c0
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 20:13:25 -07:00
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
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
39764f41a5
pixelflinger: Provide more scanline shortcut functions.
...
This patch adds a dozen more "shortcut" scanline-processing functions
to pixel-flingers. All of them avoid using the JIT for the corresponding
operation (on ARM), or using the generic and _extremely_ slow 'scanline'
function (on x86, where there is no JIT).
The shortcuts were selected by running the system under emulation
(build full_x86-eng, then launch emulator-x86), and correspond to
operations that are in use when using the system's typical UI features.
This makes it much more responsive and amenable to testing most
applications, at least those that don't use OpenGL ES heavily.
Note that HW OpenGLES emulation is under completion and should solve this
problem entirely, though is not there yet.
Change-Id: I9c73ba21ad158d6cc5532fabe7ed2419e00ecb3f
2011-04-16 13:13:58 +02:00
a0d8f0def7
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
2011-04-15 20:02:01 -07:00
bdaaec1ba0
Use DHCP server as gateway when it is absent
...
Some routers can return 0.0.0.0 as gateway address,
use DHCP server as gateway in such instances
Change-Id: I7e8db8e619475efce53ce391f77f2c13c3b7268c
2011-04-15 16:35:59 -07:00
596a670c31
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
2011-04-13 12:40:48 -07:00
112445b8a7
adb: Don't allow a forced exit if data is still in the socket
...
Fixes the http://b/4271011 "adb shell cat /init.rc output gets truncated"
Change-Id: I6df64374b60789595fb18f96d429315dec032443
Signed-off-by: JP Abgrall <jpa@google.com>
2011-04-12 22:01:58 -07:00
f098c159e3
Merge "Make atomic-inline.h usable from ordinary C++ code."
2011-04-12 16:13:36 -07:00
b60d9ce1fc
Make atomic-inline.h usable from ordinary C++ code.
...
Change-Id: I18dcba9cb3adc22f26403e94df4b2684f51090ed
2011-04-11 20:00:42 -07:00
6f49d5f266
Add missing function required to load Crespo RIL library.
...
ifc_set_mask() function was removed in a previous change. This function
is called by the Crespo RIL, so we can't remove it yet.
Bug: 4268537
Change-Id: I634580ee8d2a1aff069178837cc121c89c5e73f9
2011-04-11 19:46:41 -07:00
203f9513fd
am 0ffe483a: am e4bcf830: am d37e0840: Merge "In serial, skip over port as well if numbers found after colon."
...
* commit '0ffe483a6a9191fc6da031bbcdbdc50f6f64bdf0':
In serial, skip over port as well if numbers found after colon.
2011-04-11 15:08:00 -07:00
91758c1746
Merge "Add the touch command to toolbox."
2011-04-11 15:03:29 -07:00
0ffe483a6a
am e4bcf830: am d37e0840: Merge "In serial, skip over port as well if numbers found after colon."
...
* commit 'e4bcf8305748e8799df9047fb0f6881553dd43b5':
In serial, skip over port as well if numbers found after colon.
2011-04-11 14:55:01 -07:00
6541ef1562
Add keychain user
...
Change-Id: Id6738d7c97dd58b2043e2cba018797e3b2b4d77a
2011-04-08 14:06:16 -07:00
8b0c302a87
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
2011-04-07 18:37:35 -07:00
Nick Kralevich
Vernon Tang
Mike Lockwood
David 'Digit' Turner
Bernhard Reutner-Fischer
The Android Automerger
Dima Zavin
Irfan Sheriff
JP Abgrall
Carl Shapiro
Jake Hamby
Ken Sumrall
Brian Carlstrom