Elliott Hughes
0dcc3f65b1
am 9c814648: Merge "Add USB Vendor ID for Micromax Informatics Ltd."
...
* commit '9c814648aefb7fe2ef30a62cf3b6d9e506a9b301':
Add USB Vendor ID for Micromax Informatics Ltd.
2014-09-05 23:13:58 +00:00
Elliott Hughes
9c814648ae
Merge "Add USB Vendor ID for Micromax Informatics Ltd."
2014-09-05 23:07:08 +00:00
Abhishek Karmakar
4d10523be8
Add USB Vendor ID for Micromax Informatics Ltd.
...
Signed-off-by: Abhishek Karmakar <abhishek.karmakar@micromaxinfo.com>
Change-Id: I63462eb15575cc953ac0246ee5d4c883d3678c08
2014-09-05 16:06:25 -07:00
Mark Salyzyn
7fd87c0bf1
am 1ac35b09: Merge "Fix for parenthesis error"
...
* commit '1ac35b099636399eab8f16d94b6210ec366f9c99':
Fix for parenthesis error
2014-09-04 22:54:59 +00:00
Mark Salyzyn
1ac35b0996
Merge "Fix for parenthesis error"
2014-09-04 22:45:49 +00:00
Andreas Gampe
8e10bfd9cc
am 88d1bc0e: Merge "NativeBridge: Refactor for new initialization flow"
...
* commit '88d1bc0ebd7a02c36e64a1e46ad5678d521b955d':
NativeBridge: Refactor for new initialization flow
2014-09-04 21:59:44 +00:00
Andreas Gampe
88d1bc0ebd
Merge "NativeBridge: Refactor for new initialization flow"
2014-09-04 21:47:30 +00:00
Andreas Gampe
035bd7541e
NativeBridge: Refactor for new initialization flow
...
Setup becomes Load, have explicit Initialize and Unload.
Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
2014-09-04 12:57:54 -07:00
Arseniy Antonov
c3ce224c62
Fix for parenthesis error
...
Added parentheses as it was suggested by compiler.
error: suggest parentheses around operand of '!' or change '&' to '&&' or '!' to '~' [-Werror=parentheses]
Change-Id: Ic3746d9804488411d10d460ddfda11f1fad8efef
Signed-off-by: Arseniy Antonov <arseniy.antonov@intel.com>
2014-09-03 17:29:20 +04:00
Mark Salyzyn
3888a4d07f
am 35a76df5: Merge "logcat: document help tail from time"
...
* commit '35a76df583a07524bec5ccaae8082a00e0c06867':
logcat: document help tail from time
2014-09-02 21:45:15 +00:00
Mark Salyzyn
35a76df583
Merge "logcat: document help tail from time"
2014-09-02 21:35:15 +00:00
Nick Kralevich
465fc3b974
am 1cbf4329: Merge "Remove obsolete warning from restorecon_recursive documentation."
...
* commit '1cbf432918a2375378e1762f2f329d17ab7ec765':
Remove obsolete warning from restorecon_recursive documentation.
2014-09-02 15:52:11 +00:00
Nick Kralevich
1cbf432918
Merge "Remove obsolete warning from restorecon_recursive documentation."
2014-09-02 15:39:07 +00:00
Stephen Smalley
d9c19b0c15
Remove obsolete warning from restorecon_recursive documentation.
...
We originally included a warning to not invoke restorecon_recursive
with a path leading to a shell-writable or app-writable directory
due to concerns about the potential for mischief with symlinks during
the restorecon_recursive. However, this warning was never necessary for
calling restorecon_recursive during system initialization before an adb
shell or app can run, and we have further prohibited init from
reading/following symlinks that can be created by shell or apps in
policy, so this warning is superfluous. It also contradicts current
usage of restorecon_recursive in rootdir/init.rc, since it is called
there on /data.
Change-Id: I28a635e0b5991ced8adcef93e7a04f9d9e5634fd
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-09-02 09:34:53 -04:00
Mark Salyzyn
190b7ac9d2
logcat: document help tail from time
...
(cherry picked from commit 6a594683ec )
Bug: 17323719
Change-Id: Id057dde60e699c946828f4aeabedf1728b3bc877
2014-09-01 11:45:53 -07:00
Elliott Hughes
bf921c5112
am 7a1973ec: Merge "remove examples of unimplemented triggers ( device-added device-removed ) from init/readme.txt"
...
* commit '7a1973ece3f3f5e1870f7b169281b48b0ca1cd3c':
remove examples of unimplemented triggers ( device-added device-removed ) from init/readme.txt
2014-08-29 22:26:51 +00:00
Elliott Hughes
7a1973ece3
Merge "remove examples of unimplemented triggers ( device-added device-removed ) from init/readme.txt"
2014-08-29 22:15:17 +00:00
Trevor Drake
d028394a27
remove examples of unimplemented triggers ( device-added device-removed )
...
from init/readme.txt
Change-Id: I16e226d8f563a223ae20044fff30498883bc4ae2
2014-08-29 20:07:28 +01:00
Elliott Hughes
61b4b8095a
am d1d11fcb: Merge "Build the optional \'r\' tool separately."
...
* commit 'd1d11fcbe55ed7c7d49e857565fb2ec06ad5b54c':
Build the optional 'r' tool separately.
2014-08-29 16:34:23 +00:00
Elliott Hughes
d1d11fcbe5
Merge "Build the optional 'r' tool separately."
2014-08-29 16:27:23 +00:00
Elliott Hughes
660e750b12
Build the optional 'r' tool separately.
...
You can't use $(TARGET_BUILD_VARIANT) to change how a module
is built like this makefile used to.
Change-Id: Ie6a274cab9a77eb2376a9494e9c17aae8ba0ee0b
Signed-off-by: Olivier Fourdan <olivier.fourdan@intel.com>
Signed-off-by: Guilhem IMBERTON <guilhem.imberton@intel.com>
2014-08-28 20:44:20 -07:00
Brian Carlstrom
24d2adba7a
am 188d4396: Merge "Change /dalvik-cache to be owned by root."
...
* commit '188d4396b8b02d970a129fbcb869daff38ca9232':
Change /dalvik-cache to be owned by root.
2014-08-29 01:12:09 +00:00
Brian Carlstrom
188d4396b8
Merge "Change /dalvik-cache to be owned by root."
2014-08-28 23:17:06 +00:00
Elliott Hughes
8e207634c8
am d5f230af: Merge "Remove descriptions of unimplemented triggers."
...
* commit 'd5f230af0733f350910901e09ac8c275a388d79f':
Remove descriptions of unimplemented triggers.
2014-08-28 17:02:56 +00:00
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
Alex Light
3878ebd724
Change /dalvik-cache to be owned by root.
...
Bug: 16875245
Change-Id: I29a70215a2207bc4e0db02ab751d32a68edf4b66
2014-08-27 15:42:19 -07:00
Hans Boehm
424eaece64
am 69001e08: Merge "Remove android_... store_barriers and 64-bit atomics."
...
* commit '69001e08569ec2f23ccb4a8bd087affcc4f1c26c':
Remove android_... store_barriers and 64-bit atomics.
2014-08-27 21:52:46 +00: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
619765d736
am 31e29dbe: Merge "Remove duplication from sendevent.c."
...
* commit '31e29dbe1e7e8236bc03764f3da0303b207268c6':
Remove duplication from sendevent.c.
2014-08-26 16:02:30 +00: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
1ee7e520e2
am ec7cc932: Merge "Fix typo: ifndef -> ifneq"
...
* commit 'ec7cc9326e545f8ad32e03d2416e04850bdd454b':
Fix typo: ifndef -> ifneq
2014-08-26 00:25:20 +00: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
cf2b944df6
am 5a1d5a8c: Merge "ueventd: call _exit for safety"
...
* commit '5a1d5a8c79d0148291700cc5773a1519f2c6d8eb':
ueventd: call _exit for safety
2014-08-25 17:16:00 +00: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
b48c46bcc2
am 3cebf9f8: Merge "Add BSD false(1) and true(1)."
...
* commit '3cebf9f8c37262ba8c1ec8fcaa7083a6f8d82b77':
Add BSD false(1) and true(1).
2014-08-24 05:28:32 +00: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
100386a9e7
am e0677ccf: Merge "NativeBridge: Tighten security on libnativebridge"
...
* commit 'e0677ccf998602e48d3c9777d22c401283464c46':
NativeBridge: Tighten security on libnativebridge
2014-08-22 11:37:12 +00: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 )
Change-Id: Ie22de356d2307fe2758f9094a85d44e61a4098a1
2014-08-22 01:44:06 -07:00
Elliott Hughes
4592d73e18
am a59b6ac6: Merge "Only the Mac doesn\'t have open_memstream."
...
* commit 'a59b6ac6973b3f5ce1246bf73969094779436892':
Only the Mac doesn't have open_memstream.
2014-08-21 02:58:30 +00: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
f7e88e51b3
am 373c7758: Merge "There\'s no non-SMP LP64."
...
* commit '373c77583f9d8eab88e4321d1a2e2af8f5ae8ea7':
There's no non-SMP LP64.
2014-08-20 20:22:23 +00:00
Elliott Hughes
373c77583f
Merge "There's no non-SMP LP64."
2014-08-20 12:21:52 +00:00