Josh Gao
73a9681319
Merge "adb: make adb reconnect perform a USB reset." am: 3b25a17a8a am: 0d9d5ef1bb
...
am: e5a5a5b18f
Change-Id: If54f9d0b4c8a003ab7cd5557a4d0b0a48fc3654d
2019-04-01 15:34:48 -07:00
Josh Gao
e5a5a5b18f
Merge "adb: make adb reconnect perform a USB reset." am: 3b25a17a8a
...
am: 0d9d5ef1bb
Change-Id: Id5b2114e90661025563e2eae19567a1eef13e779
2019-04-01 15:18:12 -07:00
Steven Moreland
d33a2ee172
libutilscallstack: removed from darwin
...
libbacktrace only includes its Backtrace.cpp on the linux targets
but not windows or darwin targets. So, both should be disabled.
Previously, libutilscallstack was only ever a static library on
these platforms. Since nothing provided the symbols, these targets
couldn't have been used.
Fixes: 129636352
Test: m
Change-Id: I3f0b09e1d67c485b3ea57f58d1220d9516b326f2
2019-04-01 15:16:13 -07:00
Josh Gao
0d9d5ef1bb
Merge "adb: make adb reconnect perform a USB reset."
...
am: 3b25a17a8a
Change-Id: Ic952e10f80684614a0f9da795c730bb52be5a259
2019-04-01 15:12:04 -07:00
Josh Gao
3b25a17a8a
Merge "adb: make adb reconnect perform a USB reset."
2019-04-01 21:42:57 +00:00
Elliott Hughes
fd12160087
libutils: more detailed logging.
...
The question arose on the bug of whether this is a legit errno or just
a stale value.
Bug: http://b/129139241
Test: ran tests
Change-Id: I486176496028f04d4fcccdd0b29a3df6b13849c9
2019-04-01 12:24:19 -07:00
Elliott Hughes
bfd9d63c74
grep: fix ASan heap-buffer-overflow.
...
Like the regular fgetln(), grep_fgetln() doesn't NUL-terminate the
string, which regexec() doesn't like. ASan just gained the ability to
intercept regexec(), which is why we didn't find this previously.
Bug: http://b/129089665
Test: adb shell grep -R /system -e "abc"
Test: toybox grep tests
Change-Id: Id707cea66a873b83bd763a3dcdf726ac7d062ce0
2019-04-01 10:58:38 -07:00
Jaegeuk Kim
cc563077bf
Merge "init.rc: tune F2FS to be aligned to system settings" am: 99ba4b36e8 am: d2060b771d
...
am: e727f6612c
Change-Id: I7a6b250ebb79baf726de6f6493fc2f11262682c4
2019-04-01 09:34:17 -07:00
Jaegeuk Kim
e727f6612c
Merge "init.rc: tune F2FS to be aligned to system settings" am: 99ba4b36e8
...
am: d2060b771d
Change-Id: Ic3a3a07eebbc66efef9a15db17b2ca5b8d2a15c8
2019-04-01 09:27:02 -07:00
Jaegeuk Kim
d2060b771d
Merge "init.rc: tune F2FS to be aligned to system settings"
...
am: 99ba4b36e8
Change-Id: I1321d587c6bfc5277a9ad16d74ef523e6bd9a789
2019-04-01 09:22:49 -07:00
Treehugger Robot
99ba4b36e8
Merge "init.rc: tune F2FS to be aligned to system settings"
2019-04-01 16:10:28 +00:00
Bowgo Tsai
d03dfdf984
Merge "Adding GSI public keys" am: ddaf736a88 am: aea89ed3ea
...
am: 7e4834ce7f
Change-Id: If46aa415528d998afc4fbac7a2d6992fc285045d
2019-04-01 07:14:57 -07:00
Bowgo Tsai
7e4834ce7f
Merge "Adding GSI public keys" am: ddaf736a88
...
am: aea89ed3ea
Change-Id: I3736607f4d8e4239475f792f81cee161258eb9eb
2019-04-01 07:05:42 -07:00
Bowgo Tsai
aea89ed3ea
Merge "Adding GSI public keys"
...
am: ddaf736a88
Change-Id: I096dd2f6e98b1538a224e65b5b29d9d2406bf6c0
2019-04-01 07:00:13 -07:00
Treehugger Robot
ddaf736a88
Merge "Adding GSI public keys"
2019-04-01 13:43:34 +00:00
Julien Desprez
69ac4561ad
Merge "Add the basic config to run through atest" am: dc738093fe am: d006f4154e
...
am: e62782cfc5
Change-Id: I4a9ead596891f1d104e96506e75ebc9c5e1623f6
2019-03-31 20:52:03 -07:00
Julien Desprez
e62782cfc5
Merge "Add the basic config to run through atest" am: dc738093fe
...
am: d006f4154e
Change-Id: I146bda82e6e618497a06a06365fde61951a25938
2019-03-31 20:39:44 -07:00
Julien Desprez
d006f4154e
Merge "Add the basic config to run through atest"
...
am: dc738093fe
Change-Id: Ib17a09268aaee034d113f04aa63f6abc7a0a5ad1
2019-03-31 20:35:37 -07:00
Treehugger Robot
dc738093fe
Merge "Add the basic config to run through atest"
2019-04-01 03:20:20 +00:00
Ken Tsou
7024e75744
Merge "charger: fix show 0% symptom when start to draw UI" am: a93a89f4bd am: 5052f7db39
...
am: 9267928836
Change-Id: I34070e1d27ac4cce63730597350bd3fdb0cde21e
2019-03-31 19:47:31 -07:00
Ken Tsou
9267928836
Merge "charger: fix show 0% symptom when start to draw UI" am: a93a89f4bd
...
am: 5052f7db39
Change-Id: Icf6c36e86d5b7ab10d86f7c38cbd1173f4f6d964
2019-03-31 19:43:26 -07:00
Ken Tsou
5052f7db39
Merge "charger: fix show 0% symptom when start to draw UI"
...
am: a93a89f4bd
Change-Id: Ic895a53a18776d21f15e21ccd5eba67a7a7c985c
2019-03-31 19:39:16 -07:00
Treehugger Robot
a93a89f4bd
Merge "charger: fix show 0% symptom when start to draw UI"
2019-04-01 02:27:47 +00:00
Christopher Ferris
da70b93fe9
Merge "Remove sequential search from DwarfEhFrameWithHdr." am: cab97bc6eb am: 3b6c4210f5
...
am: 9f6f6f071d
Change-Id: I271afb252169dc6ad06e2b2e8e84363b9106a7dd
2019-03-29 20:15:51 -07:00
Christopher Ferris
9f6f6f071d
Merge "Remove sequential search from DwarfEhFrameWithHdr." am: cab97bc6eb
...
am: 3b6c4210f5
Change-Id: Iff2f6320f9dcc91bc262290bebdc203e0683c778
2019-03-29 20:10:47 -07:00
Bowgo Tsai
5fdd7861bb
Adding GSI public keys
...
This CL adds three GSI keys, to allow booting a GSI with AVB
to enable dm-verity.
https://android.googlesource.com/platform/external/avb/
The keys for R and S GSI is to allow a device boots a new
version of GSI in a Treble-compatible manner.
For more information about GSI, please visit:
https://source.android.com/setup/build/gsi
Bug: 112293933
Test: m q-gsi.avbpubkey r-gsi.avbpubkey s-gsi.avbpubkey
Change-Id: I4439e44fbd5da3240d7f6c7987f66445ec4590c5
2019-03-30 03:07:31 +00:00
Christopher Ferris
3b6c4210f5
Merge "Remove sequential search from DwarfEhFrameWithHdr."
...
am: cab97bc6eb
Change-Id: I7663f76ca8ccbd7c36bd7b586a91dd78377cab9a
2019-03-29 20:06:32 -07:00
Christopher Ferris
cab97bc6eb
Merge "Remove sequential search from DwarfEhFrameWithHdr."
2019-03-30 02:55:59 +00:00
Steven Moreland
6e10e67eaa
Merge "libutils/libcutils: make host more like device" am: 43f29072a9 am: 02bb6c1b24
...
am: 775ed88ddd
Change-Id: I6d9a2c90499622ad61046b3c222f8cb9d688bd16
2019-03-29 17:49:56 -07:00
Steven Moreland
775ed88ddd
Merge "libutils/libcutils: make host more like device" am: 43f29072a9
...
am: 02bb6c1b24
Change-Id: Ia7a1579ba589a8d68379ba9adfb5b69ebc1ed868
2019-03-29 17:06:57 -07:00
Mikhail Naganov
10bb961bf4
Merge "libutils: Fix thread safety annotations in Mutex" am: f8fe94e546 am: 8105c31189
...
am: cce9c65f53
Change-Id: I91f48e9ae520b1c1408c813d059a9403af88df48
2019-03-29 16:48:37 -07:00
Steven Moreland
02bb6c1b24
Merge "libutils/libcutils: make host more like device"
...
am: 43f29072a9
Change-Id: Ibe6cd59c77e6a65b7d6b0d864057d0c90c6d9063
2019-03-29 16:37:42 -07:00
Mikhail Naganov
cce9c65f53
Merge "libutils: Fix thread safety annotations in Mutex" am: f8fe94e546
...
am: 8105c31189
Change-Id: Idb3b730d5ec3a7c0101f7b5e782c587a252908d0
2019-03-29 16:26:23 -07:00
Steven Moreland
43f29072a9
Merge "libutils/libcutils: make host more like device"
2019-03-29 23:05:20 +00:00
Mikhail Naganov
8105c31189
Merge "libutils: Fix thread safety annotations in Mutex"
...
am: f8fe94e546
Change-Id: Ied4eab63acfdcd460de8b54b603180e9dd219478
2019-03-29 15:51:21 -07:00
Jaegeuk Kim
f65df964c0
init.rc: tune F2FS to be aligned to system settings
...
Android sets /proc/sys/vm/dirty_expire_centisecs to 200, so f2fs
doesn't need to do checkpoint in 60 seconds.
Bug: 127511432
Change-Id: I2ba0623053d4480b82003eb1cca85ff03c61fc0f
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2019-03-29 22:43:29 +00:00
Mikhail Naganov
f8fe94e546
Merge "libutils: Fix thread safety annotations in Mutex"
2019-03-29 22:28:01 +00:00
Christopher Ferris
22d8e8e12f
Remove sequential search from DwarfEhFrameWithHdr.
...
Since there has never been a time that a sequential search has been
necessary, simply remove the sequential code and allow the DwarfEhFrame
object to be used in that case. If this does come up regularly, I'm not
sure that it wouldn't be more performant to use the DwarfEhFrame object
regardless.
Bug: 129550015
Test: libunwindstack unit tests, libbacktrace unit tests.
Change-Id: I738e81accb9bc1e182168cddc9c0c22823e3369b
2019-03-29 14:08:37 -07:00
Elliott Hughes
d4952191e4
Merge "BSD grep: sync with upstream." am: a42823b264 am: 1a420368d8
...
am: 0b2474d84f
Change-Id: I02cc77ba673fd298623f44164da7b2b0957d9000
2019-03-29 13:39:41 -07:00
Suren Baghdasaryan
f33436d720
Merge "Set /proc/pressure/memory file permissions" am: 3cf9850cef am: e337910a35
...
am: d8a1ee860c
Change-Id: I46d066d35a97a0d0fc01240c58a8060a40d6cea7
2019-03-29 13:36:57 -07:00
Elliott Hughes
0b2474d84f
Merge "BSD grep: sync with upstream." am: a42823b264
...
am: 1a420368d8
Change-Id: I05ae825023ccee75d4250fae92452a2bed681274
2019-03-29 13:25:00 -07:00
Elliott Hughes
1a420368d8
Merge "BSD grep: sync with upstream."
...
am: a42823b264
Change-Id: I5cbc85a29fe9092861dc6853e13c4030de17e748
2019-03-29 13:16:33 -07:00
Suren Baghdasaryan
d8a1ee860c
Merge "Set /proc/pressure/memory file permissions" am: 3cf9850cef
...
am: e337910a35
Change-Id: I9a771fd117fd04c214bee0e0ca38e20c1ac1f2c5
2019-03-29 13:12:13 -07:00
Suren Baghdasaryan
e337910a35
Merge "Set /proc/pressure/memory file permissions"
...
am: 3cf9850cef
Change-Id: Ic8fb7068d51559996fc8c31df05ddd67297974b3
2019-03-29 12:56:19 -07:00
Treehugger Robot
a42823b264
Merge "BSD grep: sync with upstream."
2019-03-29 19:46:17 +00:00
Suren Baghdasaryan
3cf9850cef
Merge "Set /proc/pressure/memory file permissions"
2019-03-29 19:38:31 +00:00
Mikhail Naganov
e1a285ddc1
libutils: Fix thread safety annotations in Mutex
...
The annotations for Mutex::tryLock and timedLock were
incorrectly specifying the return value for the successful
acquisition.
Test: make libutils_test
Change-Id: I9729b6555ede5cb1d6db046e33c35bf5926c7755
2019-03-29 12:21:57 -07:00
David Srbecky
85b5fecec9
Check for data races when reading JIT/DEX entries.
...
Update the entries only when the list is modified by the runtime.
Check that the list wasn't concurrently modified when being read.
Bug: 124287208
Test: libunwindstack_test
Test: art/test.py -b --host -r -t 137-cfi
Change-Id: I87ba70322053a01b3d5be1fdf6310e1dc21bb084
2019-03-29 14:01:32 +00:00
Ken Tsou
6c7ece743c
charger: fix show 0% symptom when start to draw UI
...
Bug: 123060995
Test: m -j succeeded and confirm offmode charge UI behavior
Change-Id: I7412157cfe829a86e72b3f43d9c43032f3567ed3
2019-03-29 18:33:00 +08:00
Bernie Innocenti
cc347b9d4e
Merge "Disallow operator!() on unique_fd" am: 0a887aa14c am: c730327691
...
am: ba394579cb
Change-Id: Ie9bfc735da5d1f74da3a409e910e012aaf0c4431
2019-03-28 21:31:39 -07:00