Commit Graph

27072 Commits

Author SHA1 Message Date
Glenn Kasten 7f0c037fa9 Merge "Traverse /etc/init in a well-defined order" into nyc-mr1-dev am: 5639d9ad6e
am: 524d444f66

Change-Id: Icebc7d92aaa4e8b03952ad375a79cf59fd258bc1
2016-10-11 17:27:02 +00:00
Glenn Kasten 51d4f6e576 Traverse /etc/init in a well-defined order am: 89579f241c
am: ac087d798b  -s ours

Change-Id: I79631090c715153bf66a9f65833d36a7a611b758
2016-10-11 17:26:49 +00:00
Mark Salyzyn d22ec4759d Merge "liblog: adb: move security interfaces to private" am: 09dac589f1 am: 586c6985cf am: 4b5456eacc
am: 144abd8cb2

Change-Id: I7cfbc0e02d7a174b471528424ef6b5f7291e96eb
2016-10-10 23:45:01 +00:00
Josh Gao d81a2fab67 Merge commit 'd3896c106d6a6e4d461be658a9e66efbde31f28d' into nyc-dev-plus-aosp am: e758b2b3d3
am: e28282c2a2

Change-Id: I1686bec34d1f7fe407e71a486c70a2dc90660712
2016-10-10 23:44:47 +00:00
Mark Salyzyn 144abd8cb2 Merge "liblog: adb: move security interfaces to private" am: 09dac589f1 am: 586c6985cf
am: 4b5456eacc

Change-Id: Id78628d7e7abfa16f1ada16f894f9616a2dc469b
2016-10-10 23:34:54 +00:00
Josh Gao e28282c2a2 Merge commit 'd3896c106d6a6e4d461be658a9e66efbde31f28d' into nyc-dev-plus-aosp
am: e758b2b3d3

Change-Id: Idd9d6f307b0f905085615bd651927c6c4472a886
2016-10-10 23:34:38 +00:00
Mark Salyzyn 4b5456eacc Merge "liblog: adb: move security interfaces to private" am: 09dac589f1
am: 586c6985cf

Change-Id: I8c54bdc1a3582be1fc7c4a9be83b555624fcb0a3
2016-10-10 23:29:55 +00:00
Josh Gao e758b2b3d3 Merge commit 'd3896c106d6a6e4d461be658a9e66efbde31f28d' into nyc-dev-plus-aosp
Change-Id: I77d77be5ba21c55cdf1172d7a7f7b4ba04dcbc81
2016-10-10 16:20:04 -07:00
Tao Bao 2755196c96 Merge "Update the header path for ext4_utils." am: 5bc3ce85cf am: 148b85b050 am: 2815ac5584
am: 6efc7a787b

Change-Id: Iacce14b307b449d2dd1de3a4ceada7d4fab99493
2016-10-10 23:01:38 +00:00
Treehugger Robot bd6c6eb0e4 Merge "Remove useless arguments from is_adb_interface." 2016-10-10 22:50:13 +00:00
Tao Bao 6efc7a787b Merge "Update the header path for ext4_utils." am: 5bc3ce85cf am: 148b85b050
am: 2815ac5584

Change-Id: I966296de6eb4ff7518b9cfcd5853fe919765b826
2016-10-10 22:14:48 +00:00
Mark Salyzyn 586c6985cf Merge "liblog: adb: move security interfaces to private"
am: 09dac589f1

Change-Id: I05ad9cee5ffe00e842120aa960d6652517b94a16
2016-10-10 22:04:39 +00:00
Treehugger Robot 09dac589f1 Merge "liblog: adb: move security interfaces to private" 2016-10-10 21:54:31 +00:00
Tao Bao 2815ac5584 Merge "Update the header path for ext4_utils." am: 5bc3ce85cf
am: 148b85b050

Change-Id: I5f862edbdbc3b9c0e09113a9acff26773ceebb87
2016-10-10 21:46:03 +00:00
Elliott Hughes 36e0d390a2 Rely on the platform -std default.
Bug: http://b/32019064
Test: builds
Change-Id: I18a1d816d63b64601485045070851f32d44e85eb
2016-10-10 14:31:12 -07:00
Josh Gao d3896c106d Merge "debuggerd: report crashes even when out of file descriptors."
am: 06928658c4

Change-Id: I58cbd1f062c59b185b142c3c301221db8c98add5
2016-10-10 21:31:02 +00:00
Tianjie Xu bcc4431f24 Check filename memory bound when parsing ziparchive
Add a check to ensure the filename boundary doesn't exceed the mapped
memory region. Also add the corresponding unit test.

Bug: 28802225
Test: New unit test passes.
Change-Id: Ibf543a7da3d7898952e9eb332c84cdfc67cf5aa4
2016-10-10 14:26:15 -07:00
Treehugger Robot 06928658c4 Merge "debuggerd: report crashes even when out of file descriptors." 2016-10-10 21:22:27 +00:00
Tao Bao 148b85b050 Merge "Update the header path for ext4_utils."
am: 5bc3ce85cf

Change-Id: I962e2c4b311ea93c12de8be26b7a228fae1b1b22
2016-10-10 21:14:46 +00:00
Ruchi Kandoi 6e5739d671 libmemtrack: Add HIDL support for Memtrack
Bug: 31180823
Change-Id: I9be61e17028baa218e7b4aea9383109360687a30
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2016-10-10 14:11:18 -07:00
Josh Gao 30186df0f0 Remove useless arguments from is_adb_interface.
Test: mma
Change-Id: I8b7b411d7d5ec9d401b61ed8f817b98c61114d4f
2016-10-10 13:44:00 -07:00
Tao Bao 5bc3ce85cf Merge "Update the header path for ext4_utils." 2016-10-10 20:07:32 +00:00
Christopher Ferris bd615a56ce Merge "Small clean up of fuse code." am: 54c211db2e am: f620b87efe am: c2eaefdd15
am: 5e27cd514f

Change-Id: Ic323724c76b3df1af78d37bc0ced34257c142513
2016-10-10 19:48:20 +00:00
Christopher Ferris 5e27cd514f Merge "Small clean up of fuse code." am: 54c211db2e am: f620b87efe
am: c2eaefdd15

Change-Id: I800d48fb1d74531681cdcd35fcd3ea674e7c3025
2016-10-10 19:42:33 +00:00
Christopher Ferris c2eaefdd15 Merge "Small clean up of fuse code." am: 54c211db2e
am: f620b87efe

Change-Id: Ic2d731690121c5e047d1df2376ef5a8f83be14ea
2016-10-10 19:37:11 +00:00
Christopher Ferris f620b87efe Merge "Small clean up of fuse code."
am: 54c211db2e

Change-Id: I09fbb1879d506789956c30d4890e4f6908003fa0
2016-10-10 19:31:29 +00:00
Christopher Ferris 54c211db2e Merge "Small clean up of fuse code." 2016-10-10 19:22:24 +00:00
Glenn Kasten 524d444f66 Merge "Traverse /etc/init in a well-defined order" into nyc-mr1-dev
am: 5639d9ad6e

Change-Id: I7f22d6962b2b40abed3b44dcf15242144f2a4e24
2016-10-10 16:47:21 +00:00
Tao Bao 0cc93194eb Merge "Update the header path for ext4_utils." 2016-10-10 16:44:40 +00:00
Glenn Kasten ac087d798b Traverse /etc/init in a well-defined order
am: 89579f241c

Change-Id: I7d56236bb85e6c0a27f7c3f304eb8bd04576e3ef
2016-10-10 16:41:19 +00:00
Glenn Kasten 5639d9ad6e Merge "Traverse /etc/init in a well-defined order" into nyc-mr1-dev 2016-10-10 16:13:36 +00:00
Mark Salyzyn 6debf985aa liblog: adb: move security interfaces to private
Test: Compile & adb functioning
Bug: 19235719
Bug: 26552300
Bug: 31289077
Bug: 31456426
Change-Id: I7ad8963bcca3d8b5c37b547c11d163b652d35556
2016-10-10 15:15:45 +00:00
Glenn Kasten a3d98bc62e Merge "Traverse /etc/init in a well-defined order" am: db7715c7dd am: 31dcb81e63 am: 010624bd2c
am: af97f66b59

Change-Id: Ib13e0e5a02db8719fa8fc3edea7db6fcd5f95ed3
2016-10-09 18:12:41 +00:00
Tao Bao 27663171e0 Update the header path for ext4_utils.
Test: `mmma system/core`

Change-Id: I6291d10d6c8d4972aeca55596baa83f555496193
(cherry picked from commit 6d881d6db4)
2016-10-09 10:51:49 -07:00
Glenn Kasten af97f66b59 Merge "Traverse /etc/init in a well-defined order" am: db7715c7dd am: 31dcb81e63
am: 010624bd2c

Change-Id: Ie8c3467d5bb286bbdacb8479c62d2f52fef246df
2016-10-09 17:26:37 +00:00
Tao Bao 6d881d6db4 Update the header path for ext4_utils.
Test: `mmma system/core`

Change-Id: I6291d10d6c8d4972aeca55596baa83f555496193
2016-10-09 10:23:36 -07:00
Glenn Kasten 010624bd2c Merge "Traverse /etc/init in a well-defined order" am: db7715c7dd
am: 31dcb81e63

Change-Id: Id4f68d9eddb9e990fef07a306564a1619e87978b
2016-10-09 17:21:38 +00:00
Glenn Kasten 31dcb81e63 Merge "Traverse /etc/init in a well-defined order"
am: db7715c7dd

Change-Id: I548824b089b2abd462c83b459bb457fa1bf11a82
2016-10-09 17:17:03 +00:00
Glenn Kasten 89579f241c Traverse /etc/init in a well-defined order
Bug: 31996208
Test: will need a CTS, not yet done
Change-Id: I5ecc7f0519d42a83065b7b97a31cdb5b33549cda
2016-10-09 10:16:20 -07:00
Glenn Kasten db7715c7dd Merge "Traverse /etc/init in a well-defined order" 2016-10-09 17:11:03 +00:00
Bo Hu c956e209db Merge "Fix adb flakiness on reboot" 2016-10-08 22:05:34 +00:00
Tao Bao dcaced0e5a Merge "mkbootfs: Fix the default st_mode for root directory." am: 3dee9f1f6f am: 78b352624d am: 7f8f35ccec
am: 2122bb56cd

Change-Id: I866dd7abb3874a00f421e9db8494f9a4ddc0b4f2
2016-10-08 20:41:44 +00:00
Tao Bao 2122bb56cd Merge "mkbootfs: Fix the default st_mode for root directory." am: 3dee9f1f6f am: 78b352624d
am: 7f8f35ccec

Change-Id: I368572a38b1e24224df04c80c110fdeca5e575ec
2016-10-08 20:34:06 +00:00
Tao Bao 7f8f35ccec Merge "mkbootfs: Fix the default st_mode for root directory." am: 3dee9f1f6f
am: 78b352624d

Change-Id: I1765660b21e2de6e9b95b21c73d2cf037c855dcd
2016-10-08 20:29:31 +00:00
Tao Bao 78b352624d Merge "mkbootfs: Fix the default st_mode for root directory."
am: 3dee9f1f6f

Change-Id: I7672f883954112e0c1826eae8c3024f93824eaad
2016-10-08 20:24:32 +00:00
Treehugger Robot 3dee9f1f6f Merge "mkbootfs: Fix the default st_mode for root directory." 2016-10-08 20:16:57 +00:00
Yifan Hong 09c8decc3a Merge "Add 0X as a valid hex prefix for parseint" am: 392a2c8f0f am: 11373394fd am: 92b1727472
am: 35146c467d

Change-Id: I8504fe6492f31ff0b7f72fb1e672df6aae75eb54
2016-10-08 11:01:21 +00:00
Yifan Hong 35146c467d Merge "Add 0X as a valid hex prefix for parseint" am: 392a2c8f0f am: 11373394fd
am: 92b1727472

Change-Id: I054cbb995db521669f474a6e484f71933f4d6e91
2016-10-08 10:51:39 +00:00
Yifan Hong 92b1727472 Merge "Add 0X as a valid hex prefix for parseint" am: 392a2c8f0f
am: 11373394fd

Change-Id: I3140b23ec23d4c8af3a25afa3e20a86bf0dd8beb
2016-10-08 10:47:07 +00:00
Yifan Hong 11373394fd Merge "Add 0X as a valid hex prefix for parseint"
am: 392a2c8f0f

Change-Id: Ia9409c0424fab1966197ea5bb7a4532ed9a8c709
2016-10-08 10:42:37 +00:00