Commit Graph

28453 Commits

Author SHA1 Message Date
Bowgo Tsai cfcaca92d1 Merge "Fix-up coding style"
am: 4a534ebc91

Change-Id: Iab8691835c77b3d65ed33b1065946cc6fae64208
2017-02-19 00:27:09 +00:00
Treehugger Robot 4a534ebc91 Merge "Fix-up coding style" 2017-02-19 00:23:05 +00:00
Bowgo Tsai 4caf4c03c1 Fix-up coding style
The .clang-format is a symlink to ../init/.clang-format, which is merged
recently. As init is the major user of fs_mgr, it's better to keep the
style consistent.

Only recent newly-added files written by me are formatted. For other
files, let's format them gradually to keep 'git blame' intact.

Bug: None
Test: Device can boot with AVB

Change-Id: I5c72f23b38534d5bcef3e4f9f0f477fa40496433
2017-02-18 12:33:36 +08:00
Steven Moreland c50fce7dac Merge "Vector.h: remove unused import <new>"
am: 1a4e2dfdf5

Change-Id: I6177387a43353d5f9b4bd7fe9cc9fd7a4a10e997
2017-02-17 23:42:30 +00:00
Treehugger Robot 1a4e2dfdf5 Merge "Vector.h: remove unused import <new>" 2017-02-17 23:37:06 +00:00
Josh Gao 8a69231cda Merge "debuggerd_test: add capability test."
am: 94aabe47db

Change-Id: I7316d51dc2d5ad0a98d64710427a9cbfe5b4a44d
2017-02-17 22:29:26 +00:00
Treehugger Robot 94aabe47db Merge "debuggerd_test: add capability test." 2017-02-17 21:20:11 +00:00
Steven Moreland 40c7ddfc09 Vector.h: remove unused import <new>
Test: pass
Change-Id: I9d04c909a1bc82352f1eebe36602bf095ec3ca30
2017-02-17 13:19:08 -08:00
Elliott Hughes b343338459 Merge "adbd's children should have SIGPIPE set to SIG_DFL." am: 81c6ff3b96
am: 10ecd9de62

Change-Id: I204df35416733257c8ff2b2eb6f1ba22a17098bb
2017-02-17 20:59:29 +00:00
Elliott Hughes 10ecd9de62 Merge "adbd's children should have SIGPIPE set to SIG_DFL."
am: 81c6ff3b96

Change-Id: I5aaec2b05566d6885b11080a8de943dde838031f
2017-02-17 20:57:59 +00:00
Treehugger Robot 81c6ff3b96 Merge "adbd's children should have SIGPIPE set to SIG_DFL." 2017-02-17 20:55:55 +00:00
Elliott Hughes 1373a6c75c Merge "Add crasher check for passing a bad pthread_t to pthread_join." am: fac6d83d36
am: 1b607e7f6f

Change-Id: I4395eb6966dcc387d0da5b6de5eca2aa1984fe04
2017-02-17 20:50:58 +00:00
Elliott Hughes 1b607e7f6f Merge "Add crasher check for passing a bad pthread_t to pthread_join."
am: fac6d83d36

Change-Id: Icfa86004a6e15f80a25ed128be8f3496312a3e3b
2017-02-17 20:49:35 +00:00
Treehugger Robot fac6d83d36 Merge "Add crasher check for passing a bad pthread_t to pthread_join." 2017-02-17 20:44:44 +00:00
Josh Gao 502cfd22ba debuggerd_test: add capability test.
Also, remove the dependency on crasher.

Bug: http://b/35100921
Bug: http://b/35241370
Test: /data/nativetest/debuggerd_test/debuggerd_test32
Test: /data/nativetest64/debuggerd_test/debuggerd_test64
Change-Id: I318f6de764d435251417953bf175ba321b59981f
2017-02-17 11:22:21 -08:00
Elliott Hughes 9eb551868b adbd's children should have SIGPIPE set to SIG_DFL.
POSIX lets you choose whether or not SIGPIPE disposition is inherited,
and Linux chose "yes". Work around that.

Bug: http://b/35209888
Test: "ps -A | head" without the toybox workaround
Change-Id: I6b5afa3d87eb2af04b24c6c37fa338ab60ad2336
2017-02-17 11:14:33 -08:00
Elliott Hughes da9e3958d6 Add crasher check for passing a bad pthread_t to pthread_join.
Bug: http://b/35455349
Test: manual
Change-Id: If09454c7104a1e6de7c0edb50ee52118b7ca5eaa
2017-02-17 10:26:48 -08:00
Josh Gao ba97f47964 Merge changes I29c45a8b,I807439d8 am: 892b158af8 am: 18ac6293a5
am: 33f684e1be

Change-Id: Iaacf8d11203869586cc6b2f3afebc9378630223c
2017-02-17 08:38:30 +00:00
Josh Gao 33f684e1be Merge changes I29c45a8b,I807439d8 am: 892b158af8
am: 18ac6293a5

Change-Id: I54b01e97da700e7e143f2f0da31285c162696290
2017-02-17 08:33:58 +00:00
Josh Gao 18ac6293a5 Merge changes I29c45a8b,I807439d8
am: 892b158af8

Change-Id: I5a42470134b1f7d3bb029e16d15346fc95a97fed
2017-02-17 08:29:29 +00:00
Josh Gao 892b158af8 Merge changes I29c45a8b,I807439d8
* changes:
  crash_dump: fix overflow.
  crash_dump: remove unneeded/faulty checks.
2017-02-17 08:21:14 +00:00
Josh Gao 5ad965bf41 crash_dump: fix overflow.
`1 << 32` overflows, resulting in bogus PR_CAP_AMBIENT_RAISE attempts,
and breaking dumping for processes with capabilities in the top 32 bits.

Bug: http://b/35241370
Test: debuggerd -b `pidof com.android.bluetooth`
Change-Id: I29c45a8bd36bdeb3492c9f74599993c139821088
2017-02-16 20:16:58 -08:00
Josh Gao 2a18b822d5 crash_dump: remove unneeded/faulty checks.
We already check our /proc/`getppid()` fd every time we attach a thread, so
these were unneeded at best. The one that happened after dropping
capabilities was actively wrong, though, because /proc/pid access
checks happen on every operation. (only on some kernels?)

Also, add a check that getppid() doesn't change after opening
/proc/getppid().

Bug: http://b/35241370
Test: debuggerd -b `pidof com.android.bluetooth`
Change-Id: I807439d8c2afd027f3c382face50167a8a7946c4
2017-02-16 19:26:09 -08:00
Steven Moreland 374ef9d1c4 Merge "Remove unused primes.py python file." am: 325eeebc47 am: e9ce5716ce
am: 72ff4d5360

Change-Id: I1c734230dce8940f0e364639f13daa2f84b31243
2017-02-17 01:25:59 +00:00
Steven Moreland 72ff4d5360 Merge "Remove unused primes.py python file." am: 325eeebc47
am: e9ce5716ce

Change-Id: I71b9956ece200ebd8783f5d9853d61a382776e99
2017-02-17 01:21:30 +00:00
Steven Moreland e9ce5716ce Merge "Remove unused primes.py python file."
am: 325eeebc47

Change-Id: I65ff1525d413d60d958f6d3f20e9bf05c14ac50f
2017-02-17 01:16:57 +00:00
Treehugger Robot 325eeebc47 Merge "Remove unused primes.py python file." 2017-02-17 01:09:03 +00:00
Josh Gao 8fda41473f Merge "libdebuggerd_handler: in-process crash dumping for seccomped processes." am: c7cd48af58 am: f91add7e03
am: b9c90530a2

Change-Id: I1474911d2a114cc04847068bfb56b5e3e82baff6
2017-02-16 23:28:28 +00:00
Josh Gao b9c90530a2 Merge "libdebuggerd_handler: in-process crash dumping for seccomped processes." am: c7cd48af58
am: f91add7e03

Change-Id: If18468c6753e2c8487e48c21b79cb6eda007a0f7
2017-02-16 23:23:59 +00:00
Josh Gao f91add7e03 Merge "libdebuggerd_handler: in-process crash dumping for seccomped processes."
am: c7cd48af58

Change-Id: I81e85a215732fb81da85cc801ecc21581803f818
2017-02-16 23:19:31 +00:00
Josh Gao c7cd48af58 Merge "libdebuggerd_handler: in-process crash dumping for seccomped processes." 2017-02-16 23:11:52 +00:00
Josh Gao da311a36ab Merge "crash_dump: make output fd O_APPEND." am: a70f11331f am: 9fcaf5110d
am: 02b1dffe39

Change-Id: Iad71bae4310f06d8f1c4658c7ba3f018381dc609
2017-02-16 22:56:29 +00:00
Josh Gao 02b1dffe39 Merge "crash_dump: make output fd O_APPEND." am: a70f11331f
am: 9fcaf5110d

Change-Id: I522958406a39bd249492d54b3a0b940250cef65e
2017-02-16 22:52:31 +00:00
Josh Gao 9fcaf5110d Merge "crash_dump: make output fd O_APPEND."
am: a70f11331f

Change-Id: I8e4acd2b0d0b8e9920b8cc425633e822098a20c1
2017-02-16 22:48:22 +00:00
James Hawkins e8bac2eb03 Merge "bootstat: Report the total bootloader time." am: c724fac054 am: 55a8c380c1
am: d87e0261c4

Change-Id: Iae03a7a9c9cc4b5079f1e5fdf93c407125e3eb3f
2017-02-16 22:48:21 +00:00
Josh Gao a70f11331f Merge "crash_dump: make output fd O_APPEND." 2017-02-16 22:43:59 +00:00
James Hawkins d87e0261c4 Merge "bootstat: Report the total bootloader time." am: c724fac054
am: 55a8c380c1

Change-Id: I40bf1848f92491dd7b7ef9ee568f09867b677d63
2017-02-16 22:43:34 +00:00
James Hawkins 55a8c380c1 Merge "bootstat: Report the total bootloader time."
am: c724fac054

Change-Id: I1327b0175510e640db7321ecb85a396f9bd0d0aa
2017-02-16 22:39:04 +00:00
Steven Moreland 16afa6a0f0 Remove unused primes.py python file.
primes.py was used to calculate primes for BasicHashTable which no
longer exists.

Change-Id: I8c6e9b7882bcb8a3832c55249be6db9421d1f771
2017-02-16 14:30:44 -08:00
Treehugger Robot c724fac054 Merge "bootstat: Report the total bootloader time." 2017-02-16 22:29:22 +00:00
James Hawkins 6b5c5aa067 bootstat: Report the total bootloader time.
Bug: 35207415
Test: none
Change-Id: Id948a3b35bb3d96dc875d0a4eea869c86a71a657
2017-02-16 11:53:03 -08:00
Jerry Zhang dc55ea4875 Merge "adb: Lower EP_ALLOC retry count" am: 7cd8349198 am: fa09be5726
am: cfd7e8b211

Change-Id: Iaed5fd888b2a63224502ebbe1e54688425842d57
2017-02-16 19:40:34 +00:00
Jerry Zhang cfd7e8b211 Merge "adb: Lower EP_ALLOC retry count" am: 7cd8349198
am: fa09be5726

Change-Id: I51cd83b3cf1de65e8626c3d2a5da9a1d23813ae8
2017-02-16 19:36:35 +00:00
Jerry Zhang fa09be5726 Merge "adb: Lower EP_ALLOC retry count"
am: 7cd8349198

Change-Id: Ib9c22c54c0234299a1538428779425387b642c76
2017-02-16 19:32:34 +00:00
Jerry Zhang 7cd8349198 Merge "adb: Lower EP_ALLOC retry count" 2017-02-16 19:27:18 +00:00
Jerry Zhang 05fe272a87 adb: Lower EP_ALLOC retry count
Retries were causing timeouts on some devices.

Bug: 35418581
Test: Change usb config
Change-Id: Ie80d9eba1cb9af0acee49bd7312842533a94a87b
2017-02-16 10:56:05 -08:00
bowgotsai 9de7214703 Merge "Set libavb version into system property for Treble OTA" am: b47a22337b am: bfe7cf0e88
am: e8a04c4657

Change-Id: I247b34651a94b5cfb66ebd81292240c1857268e9
2017-02-16 10:26:28 +00:00
bowgotsai e8a04c4657 Merge "Set libavb version into system property for Treble OTA" am: b47a22337b
am: bfe7cf0e88

Change-Id: Idba5f257eb790e30ddb05384f495f1de38a92f0f
2017-02-16 10:22:27 +00:00
bowgotsai bfe7cf0e88 Merge "Set libavb version into system property for Treble OTA"
am: b47a22337b

Change-Id: I397821341206e88b75536105b23aa096b2d7b134
2017-02-16 10:17:59 +00:00
Treehugger Robot b47a22337b Merge "Set libavb version into system property for Treble OTA" 2017-02-16 10:14:28 +00:00