Elliott Hughes
d5f230af07
Merge "Remove descriptions of unimplemented triggers."
2014-08-28 16:48:14 +00:00
Trevor Drake
d4a497714a
Remove descriptions of unimplemented triggers.
...
device-added, device-removed and service-exited were described but
never implemented.
Change-Id: I6fbd05a85576d18d6741fc6dd549acc9132b0531
2014-08-28 15:38:52 +01:00
Hans Boehm
69001e0856
Merge "Remove android_... store_barriers and 64-bit atomics."
2014-08-27 21:44:30 +00:00
Hans Boehm
9959ed9530
Remove android_... store_barriers and 64-bit atomics.
...
These are no longer used, and we want to strongly discourage future use.
Keep the 32-bit variants while there are still uses. All users should move
to C11 or C++11 atomics.
Change-Id: I122b541cfd29ef4a6c932647f85d0d6a9d802061
2014-08-27 14:15:09 -07:00
Elliott Hughes
31e29dbe1e
Merge "Remove duplication from sendevent.c."
2014-08-26 15:54:51 +00:00
Elliott Hughes
8e947fe716
Remove duplication from sendevent.c.
...
Change-Id: I402e68f843e9673e1c02e4f84f4832380c0e91ac
2014-08-25 22:16:08 -07:00
Dmitriy Ivanov
ec7cc9326e
Merge "Fix typo: ifndef -> ifneq"
2014-08-25 23:29:20 +00:00
Dmitriy Ivanov
85af05ae37
Fix typo: ifndef -> ifneq
...
Change-Id: Id71c70b6fcd2659078a19cc652fd02807372f3a0
2014-08-25 16:26:29 -07:00
Kenny Root
5a1d5a8c79
Merge "ueventd: call _exit for safety"
2014-08-25 17:05:37 +00:00
Kenny Root
17baff480a
ueventd: call _exit for safety
...
Make sure to call _exit instead of exit to avoid triggering exit
handlers that may have existed in the parent process.
Print out a log message when forking to process firmware events fails.
Change-Id: I2436bdf85d9a8ea26b718e62023f1dac89864667
2014-08-25 10:05:08 -07:00
Elliott Hughes
3cebf9f8c3
Merge "Add BSD false(1) and true(1)."
2014-08-24 02:54:32 +00:00
Elliott Hughes
50221f5837
Add BSD false(1) and true(1).
...
Bug: 17000769
Change-Id: I6b218b4c2ba3f57d344f60af7a25c45f07091d64
2014-08-22 20:26:23 -07:00
Calin Juravle
e0677ccf99
Merge "NativeBridge: Tighten security on libnativebridge"
2014-08-22 11:31:06 +00:00
Andreas Gampe
049249ce7a
NativeBridge: Tighten security on libnativebridge
...
Do not allow arbitrary paths for the native bridge - only allow
simple names.
Do not allow re-setup of the native bridge.
Bug: 16404669
(cherry picked from commit cd2ef4c1af
2014-08-22 01:44:06 -07:00
Elliott Hughes
a59b6ac697
Merge "Only the Mac doesn't have open_memstream."
2014-08-21 00:11:41 +00:00
Elliott Hughes
3ff8888f66
Only the Mac doesn't have open_memstream.
...
We should probably move this into art, since they're the only people using it.
Bug: 17164505
Change-Id: I67b8f0cbad4c6368d4424e6979d6b044dd36aa37
2014-08-20 16:16:24 -07:00
Elliott Hughes
373c77583f
Merge "There's no non-SMP LP64."
2014-08-20 12:21:52 +00:00
Elliott Hughes
901c900ce6
There's no non-SMP LP64.
...
Bug: 17108682
Change-Id: I7e44ab48b5cacf989333882ffe67f39e9b0ce843
2014-08-20 13:05:55 -07:00
Dan Albert
afc9bc01b4
Merge "Update for public android_set_abort_message()."
2014-08-16 04:03:35 +00:00
Dan Albert
4047075da6
Update for public android_set_abort_message().
...
Since android_set_abort_message() is quite helpful to the platform, it's
becoming promoted to a real header with a non-private name.
Bug: 17059126
Change-Id: I3ed12b66eb07f3a6a08366d5eee147809d9a3ce9
2014-08-18 17:29:34 -07:00
Piotr Jastrzebski
8fd1f27ed8
Merge "Reject zip archives with entry names containing \0."
2014-08-16 05:59:09 +00:00
Piotr Jastrzebski
78271ba97b
Reject zip archives with entry names containing \0.
...
There should never be a need of an entry name with \0 character.
Bug: 16162465
Change-Id: Ia2ec57959280c1bb972c4d59d890c8540c5b9081
2014-08-19 11:02:58 +01:00
Piotr Jastrzebski
3e13ed0864
Merge "Cleanup ziparchive"
2014-08-16 04:31:31 +00:00
Piotr Jastrzebski
10aa9a0e24
Cleanup ziparchive
...
Addressed review comments from 8e08536108
2014-08-19 10:58:03 +01:00
Elliott Hughes
7fb0ee0c4d
Merge "Remove androidGetTid."
2014-08-16 04:08:14 +00:00
Elliott Hughes
b7659613b2
Remove androidGetTid.
...
Bug: 17048545
Change-Id: I93cbb2d7bd18d506b5f5f7f262dd9ac0fca053b4
2014-08-18 10:47:37 -07:00
Piotr Jastrzebski
5f231a43b3
Merge "Fix win_sdk build by not using vector"
2014-08-16 04:55:08 +00:00
Piotr Jastrzebski
8e08536108
Fix win_sdk build by not using vector
...
Change-Id: I4e9ee4286ea29e1f5f2ee477525e79bfa16ad9a0
2014-08-18 14:04:56 +01:00
Calin Juravle
55494fb32d
Merge "Switch libnativebridge to clang"
2014-08-16 04:31:31 +00:00
Calin Juravle
db2127b662
Switch libnativebridge to clang
...
This fixes the mac build.
(cherry picked from commit 935708be6f
2014-08-18 11:05:26 +01:00
Piotr Jastrzebski
c0879ee9d3
Merge "Replace char* with ZipEntryName in ziparchive API."
2014-08-16 04:31:31 +00:00
Colin Cross
39ab11d0d4
Merge "fastboot: add the support of the second stage image"
2014-08-16 04:08:14 +00:00
Piotr Jastrzebski
ecccc5ad93
Replace char* with ZipEntryName in ziparchive API.
...
It's important because entry names can be encoded in UTF-8 and can have \0
character in the middle.
Use vector instead of char* for prefix in IterationHandle.
Bug: 16162465
Change-Id: Ie34c8d7c6231cc258530c22bdde5542895213649
2014-08-15 12:39:45 +01:00
Calin Juravle
25a7d5f892
Merge "Move native bridge library in system/core"
2014-08-15 04:45:59 +00:00
Calin Juravle
961ae12dea
Move native bridge library in system/core
...
Bug: 16884833
Change-Id: I73aab8e212860ba5aee9444d801806d3da326a41
2014-08-12 22:39:25 +01:00
Ying Wang
e1ba39aa66
Merge "Fix 64-bit host build."
2014-08-12 19:23:43 +00:00
Ying Wang
42a809ba06
Fix 64-bit host build.
...
Bug: 13751317
Change-Id: Ibf62935b7d12a55ffc57242a26a2581b52796847
2014-08-14 15:52:54 -07:00
Piotr Jastrzebski
b242ad40b1
Merge "Revert "Make sure that names of all entries have the same encoding.""
2014-08-12 20:07:20 +00:00
Piotr Jastrzebski
bd0a74854e
Revert "Make sure that names of all entries have the same encoding."
...
This reverts commit 6a7f4bb79d
2014-08-13 09:49:25 +00:00
Piotr Jastrzebski
6a7f4bb79d
Make sure that names of all entries have the same encoding.
...
Add new public method to allow checkisc if an archive has entry names encoded in
UTF-8. If not then they will be encoded in IBM PC character encoding.
Bug: 16162465
Change-Id: I4468d76accca8a9b0b31cae8d43399ffc22cad42
2014-08-13 09:58:16 +01:00
Piotr Jastrzebski
b020676566
Merge "Make sure that names of all entries have the same encoding."
2014-08-12 19:57:35 +00:00
Badhri Jagan Sridharan
e4c5b6143b
Merge "libusbhost: Fix IOCTL call during usb_request_cancel"
2014-08-12 19:32:26 +00:00
Mark Salyzyn
d8ab8fc71c
Merge "logd: persistent reader threads"
2014-08-12 16:54:49 +00:00
Mark Salyzyn
a16f761faa
logd: persistent reader threads
...
(cherry picked from commit c113c5813e
2014-08-12 18:59:35 +00:00
Piotr Jastrzebski
8750fa7609
Merge "Make a copy of a prefix param in StartIteration"
2014-08-08 20:41:34 +00:00
Piotr Jastrzebski
34e03bdfdf
Make a copy of a prefix param in StartIteration
...
and delete it in EndIteration.
Change-Id: I4de4167700a9dba3119fde22fcd45725742f3731
2014-08-11 14:20:24 +01:00
Badhri Jagan Sridharan
ef4087bf2b
libusbhost: Fix IOCTL call during usb_request_cancel
...
USBDEVFS_DISCARDURB IOCTL call expects a pointer to the
the urb structure to be passed from userspace. LibusbHost
instead sends usbdevfs_urb**. Change this to usbdevfs_urb*.
Fixes Issue: https://code.google.com/p/android/issues/detail?id=74530
Change-Id: Ifb8a13857e1a9f62536f2a07c0965e9c419b7d4c
2014-08-07 14:58:31 -07:00
Piotr Jastrzebski
400e73720c
Merge "Add EndIteration method to free memory allocated"
2014-08-07 18:51:06 +00:00
Piotr Jastrzebski
79c8b34f36
Add EndIteration method to free memory allocated
...
in StartIteration. This method should always be called when the
iteration is over to make sure that we don't leak memory.
Change-Id: I5205c754dfafbab9bb5f06003c3663d2ec4e8a35
2014-08-11 07:58:00 +01:00
Dmitriy Ivanov
2f40ddf3f3
Merge "Do not suppress maps dump when si_addr<PAGE_SIZE"
2014-08-09 00:45:41 +00:00
