Narayan Kamath
dc9af896f0
resolved conflicts for merge of 6a949b45 to master
...
Change-Id: Ie123b4fff76ef43e2b1c0583731e88997504320e
2014-04-01 17:40:45 +01:00
Narayan Kamath
6a949b45e9
am ffca173c: am 5da2dbbc: Merge "Move zygote init config to its own file."
...
* commit 'ffca173c853a2e312610d87f40957f696ac8364a':
Move zygote init config to its own file.
2014-04-01 16:29:57 +00:00
Narayan Kamath
ffca173c85
am 5da2dbbc: Merge "Move zygote init config to its own file."
...
* commit '5da2dbbc935356f526cdfb0b522b332fc8b95fc7':
Move zygote init config to its own file.
2014-04-01 16:26:39 +00:00
Narayan Kamath
5da2dbbc93
Merge "Move zygote init config to its own file."
2014-04-01 16:22:02 +00:00
Paul McLean
89086df24f
Merge "Adding a handy predicate function (str_parms_has_key()"
2014-04-01 15:34:18 +00:00
Greg Hackmann
d9354b20c6
am 05b0d848: am 5b98e049: rootdir: reduce permissions on /dev/rtc0
...
* commit '05b0d848b890181e5782b39988a167eda7558554':
rootdir: reduce permissions on /dev/rtc0
2014-03-31 21:02:16 +00:00
Greg Hackmann
05b0d848b8
am 5b98e049: rootdir: reduce permissions on /dev/rtc0
...
* commit '5b98e0499a6cdd09b72445ceb88b1d32a5e82fd1':
rootdir: reduce permissions on /dev/rtc0
2014-03-31 20:56:21 +00:00
Greg Hackmann
788b272268
am ae66fbbe: am 697bdc60: am a740b3bb: Merge "rootdir: reduce permissions on /dev/rtc0"
...
* commit 'ae66fbbe0e747cb2485bac0fa47c9223268a2fc9':
rootdir: reduce permissions on /dev/rtc0
2014-03-31 20:30:26 +00:00
Greg Hackmann
ae66fbbe0e
am 697bdc60: am a740b3bb: Merge "rootdir: reduce permissions on /dev/rtc0"
...
* commit '697bdc604e8f266ebd6c94fc84eb5057b1a700e3':
rootdir: reduce permissions on /dev/rtc0
2014-03-31 20:24:39 +00:00
Greg Hackmann
697bdc604e
am a740b3bb: Merge "rootdir: reduce permissions on /dev/rtc0"
...
* commit 'a740b3bb409c9acdf4cf6a829b982e57a89d08de':
rootdir: reduce permissions on /dev/rtc0
2014-03-31 20:18:22 +00:00
Greg Hackmann
5b98e0499a
rootdir: reduce permissions on /dev/rtc0
...
Remove world-readable, reduce group permissions to readable by system
daemons
Change-Id: I6c7d7d78b8d8281960659bb8490a01cf7fde28b4
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-03-31 13:16:28 -07:00
Greg Hackmann
a740b3bb40
Merge "rootdir: reduce permissions on /dev/rtc0"
2014-03-31 20:13:52 +00:00
Narayan Kamath
4456a55ce6
Move zygote init config to its own file.
...
This allows us to choose different configs depending on
whether or not the target is 64 capable, and what its preferred
default is.
bug: 13647418
Change-Id: Ie1ce4245a3add7544c87d27c635ee390f4062523
2014-03-31 12:31:11 +01:00
Greg Hackmann
b34fed34af
rootdir: reduce permissions on /dev/rtc0
...
Remove world-readable, reduce group permissions to readable by system
daemons
Change-Id: I6c7d7d78b8d8281960659bb8490a01cf7fde28b4
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-03-27 15:52:01 -07:00
Colin Cross
66d4797673
am 47de0060: am bd514144: am 47770b73: Merge "debuggerd: use LOCAL_MULTILIB"
...
* commit '47de0060757b90737f1a409acd99fa4372efbf07':
debuggerd: use LOCAL_MULTILIB
2014-03-27 18:29:25 +00:00
Colin Cross
47de006075
am bd514144: am 47770b73: Merge "debuggerd: use LOCAL_MULTILIB"
...
* commit 'bd514144ad5254e4e2c08e17affe6e178bb49074':
debuggerd: use LOCAL_MULTILIB
2014-03-27 18:20:03 +00:00
Colin Cross
bd514144ad
am 47770b73: Merge "debuggerd: use LOCAL_MULTILIB"
...
* commit '47770b7396186d6700688fd039320283e5b68501':
debuggerd: use LOCAL_MULTILIB
2014-03-27 18:13:16 +00:00
Colin Cross
47770b7396
Merge "debuggerd: use LOCAL_MULTILIB"
2014-03-27 18:09:04 +00:00
Mark Salyzyn
ad3b38dfa8
am 509b1983: am a43bb3a4: am e644664f: Merge "liblog: deal with restart of logd"
...
* commit '509b198388b857236ab8f687a4b14dc1d326b875':
liblog: deal with restart of logd
2014-03-27 00:17:45 +00:00
Mark Salyzyn
509b198388
am a43bb3a4: am e644664f: Merge "liblog: deal with restart of logd"
...
* commit 'a43bb3a4d0093a45a3203c3511257116f6029f49':
liblog: deal with restart of logd
2014-03-27 00:10:38 +00:00
Mark Salyzyn
a43bb3a4d0
am e644664f: Merge "liblog: deal with restart of logd"
...
* commit 'e644664f1cbc4add3cc56981bab007380859853a':
liblog: deal with restart of logd
2014-03-26 23:59:24 +00:00
Mark Salyzyn
e644664f1c
Merge "liblog: deal with restart of logd"
2014-03-26 23:24:22 +00:00
Colin Cross
87a6b1d799
debuggerd: use LOCAL_MULTILIB
...
Use LOCAL_MULTILIB to build multiple versions of executables
instead of manually creating two build rules.
Change-Id: I1a993ff7b5f527a88735f46eec9822bb97d16490
2014-03-26 15:16:23 -07:00
Michael Wright
bbb2d48990
am a45ff0f5: (-s ours) am df33e8b5: Add BitSet64. DO NOT MERGE
...
* commit 'a45ff0f586a609974d5897bdf735d68831d2fcb7':
Add BitSet64. DO NOT MERGE
2014-03-26 19:32:08 +00:00
Michael Wright
a45ff0f586
am df33e8b5: Add BitSet64. DO NOT MERGE
...
* commit 'df33e8b544c457e4b08e8fa0b8a3eaf5eaf8fc2e':
Add BitSet64. DO NOT MERGE
2014-03-26 19:29:05 +00:00
Colin Cross
eea2bec3f4
am d3113afc: am 707f5b40: am 6940bc08: Merge "adb: Add USB vendor ID for Intermec Technologies Corp."
...
* commit 'd3113afc4775495ce1b89b031f0b26ac7d0e7cbc':
adb: Add USB vendor ID for Intermec Technologies Corp.
2014-03-26 18:29:29 +00:00
Colin Cross
d3113afc47
am 707f5b40: am 6940bc08: Merge "adb: Add USB vendor ID for Intermec Technologies Corp."
...
* commit '707f5b401ec354851c0e1b22c8ddb6aba45fba66':
adb: Add USB vendor ID for Intermec Technologies Corp.
2014-03-26 18:26:14 +00:00
Colin Cross
707f5b401e
am 6940bc08: Merge "adb: Add USB vendor ID for Intermec Technologies Corp."
...
* commit '6940bc08e2932ede027a846ee4c2084782be2f4b':
adb: Add USB vendor ID for Intermec Technologies Corp.
2014-03-26 11:22:32 -07:00
Colin Cross
6940bc08e2
Merge "adb: Add USB vendor ID for Intermec Technologies Corp."
2014-03-26 18:16:48 +00:00
Mark Salyzyn
487136d3b9
am e594b20d: am 1f25d816: am 7ce5c714: Merge "logcat: test arbitrary time to tail"
...
* commit 'e594b20d5f18055b3af424f35020b59ab64c1e87':
logcat: test arbitrary time to tail
2014-03-26 18:14:59 +00:00
Mark Salyzyn
fa5b775016
am f909d9a5: am bdb7445d: am 62f624b6: Merge "liblog: test for LOGGER_ENTRY_MAX_PAYLOAD compliance"
...
* commit 'f909d9a5374c1c3b22fb4aa48d5d073a145759f8':
liblog: test for LOGGER_ENTRY_MAX_PAYLOAD compliance
2014-03-26 18:14:59 +00:00
Mark Salyzyn
e594b20d5f
am 1f25d816: am 7ce5c714: Merge "logcat: test arbitrary time to tail"
...
* commit '1f25d81686410a2119aae51fa554b8d4f8758f97':
logcat: test arbitrary time to tail
2014-03-26 18:10:22 +00:00
Mark Salyzyn
f909d9a537
am bdb7445d: am 62f624b6: Merge "liblog: test for LOGGER_ENTRY_MAX_PAYLOAD compliance"
...
* commit 'bdb7445d5c435383179d23ef3afaae70076b5345':
liblog: test for LOGGER_ENTRY_MAX_PAYLOAD compliance
2014-03-26 18:10:22 +00:00
Mark Salyzyn
1f25d81686
am 7ce5c714: Merge "logcat: test arbitrary time to tail"
...
* commit '7ce5c714f11b97ac1cbeb47014546462e68e3465':
logcat: test arbitrary time to tail
2014-03-26 11:04:43 -07:00
Mark Salyzyn
bdb7445d5c
am 62f624b6: Merge "liblog: test for LOGGER_ENTRY_MAX_PAYLOAD compliance"
...
* commit '62f624b697fd97a5c7ad82963def157819ca3498':
liblog: test for LOGGER_ENTRY_MAX_PAYLOAD compliance
2014-03-26 11:04:43 -07:00
Mark Salyzyn
7ce5c714f1
Merge "logcat: test arbitrary time to tail"
2014-03-26 17:58:50 +00:00
Mark Salyzyn
62f624b697
Merge "liblog: test for LOGGER_ENTRY_MAX_PAYLOAD compliance"
2014-03-26 17:58:42 +00:00
Mark Salyzyn
ef7c411ac3
logcat: test arbitrary time to tail
...
- Add tail_time
- Use EXPECT instead of ASSERT to provide more coverage
- Use EXPECT_TRUE/ASSERT_TRUE when comparing NULL
- Itemize order complaints in sorted_order test
Change-Id: I55a7543fa3300c0a9524fac70111e680c2877eea
2014-03-26 10:52:21 -07:00
Mark Salyzyn
8196be3032
liblog: test for LOGGER_ENTRY_MAX_PAYLOAD compliance
...
- Add max_payload test
- Add dual_reader test
- Switch to EXPECT from ASSERT to increase test coverage
Bug: 13514601
Change-Id: I0e1c273e0ec430c0461e424731dbf166f2a3ce1b
2014-03-26 10:49:46 -07:00
Mark Salyzyn
8245af1ffd
liblog: deal with restart of logd
...
- API change, return -errno on failure for log writing
- ENOTCONN results in a reconnection and a retry of the write
Change-Id: Ib0a90b730edeaa7e3a3c9797e4e1b0c81b6adb0a
2014-03-26 09:20:22 -07:00
DanielMo
2b6612ff96
adb: Add USB vendor ID for Intermec Technologies Corp.
...
Change-Id: I6429bca087523829a13f905ae9dfa5f43b7abf8b
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
2014-03-26 15:33:23 +08:00
Paul McLean
55c6407041
Adding a handy predicate function (str_parms_has_key()
...
Change-Id: I1af5c260a1a820b65f0850ea9adb38b01fcb183c
2014-03-25 19:08:13 +00:00
Michael Wright
df33e8b544
Add BitSet64. DO NOT MERGE
...
Change-Id: Idf3e21dfaa9f90f4dcb1b4d41eed3891dda99561
2014-03-24 16:51:01 -07:00
Mark Salyzyn
65ea3cc907
am a2b2acd4: am f48c687f: am 3e1f5ba6: am c66607a8: Merge "logd: compile warning message"
...
* commit 'a2b2acd4b967640f9610209ae24435ab29f99213':
logd: compile warning message
2014-03-24 22:54:53 +00:00
Colin Cross
9a7627d3dc
am 739354f6: (-s ours) am 6c34c5da: am 55dd7d75: (-s ours) am c388b9f2: (-s ours) Merge "DO NOT MERGE: Revert "delete libnl_2""
...
* commit '739354f666ef5fa982d6f0e0100fec8149f2e351':
DO NOT MERGE: Revert "delete libnl_2"
2014-03-24 22:54:45 +00:00
Mark Salyzyn
fb231453d2
am 433aabc7: am ca3292bf: am bd0962c2: Merge "logcat: timed tests fail under load"
...
* commit '433aabc707aa6761e9c5bdaa9d640cad04fe3b74':
logcat: timed tests fail under load
2014-03-24 22:54:39 +00:00
Mark Salyzyn
4ab9c1ae34
am 14e0dc7d: am 8aa8d1ef: am e148b7eb: Merge "logcat: white and blacklist failure"
...
* commit '14e0dc7d5bf31497a1c708327e36f550a1898156':
logcat: white and blacklist failure
2014-03-24 22:54:34 +00:00
Paul Lawrence
5c789b8a31
Merge "Auto-encrypt drive at startup"
2014-03-24 22:18:58 +00:00
Mark Salyzyn
a2b2acd4b9
am f48c687f: am 3e1f5ba6: am c66607a8: Merge "logd: compile warning message"
...
* commit 'f48c687f6ce0463af6d489c1c117ee1278ee3a86':
logd: compile warning message
2014-03-24 22:12:12 +00:00
Mark Salyzyn
f48c687f6c
am 3e1f5ba6: am c66607a8: Merge "logd: compile warning message"
...
* commit '3e1f5ba67e0f2403da9278a6226e9f8979f975b7':
logd: compile warning message
2014-03-24 22:06:10 +00:00