Commit graph

26538 commits

Author SHA1 Message Date
Mark Salyzyn
124b7cb732 Merge "libcutils: move cutils/files.h to cutils/android_get_control_file.h" am: 8c41e791ed am: 809dee506e
am: 26545e3c60

Change-Id: I4ab91b2e8d6e104f2d350f6bdaf743f772673bfa
2016-11-17 15:48:38 +00:00
Mark Salyzyn
26545e3c60 Merge "libcutils: move cutils/files.h to cutils/android_get_control_file.h" am: 8c41e791ed
am: 809dee506e

Change-Id: I937ac8e0df7bd47f3db292f7acdc11c7946af868
2016-11-17 15:41:04 +00:00
Mark Salyzyn
809dee506e Merge "libcutils: move cutils/files.h to cutils/android_get_control_file.h"
am: 8c41e791ed

Change-Id: Ifbc00285da734859d590153a7c6cfc8e51c014f9
2016-11-17 15:33:02 +00:00
Mark Salyzyn
8c41e791ed Merge "libcutils: move cutils/files.h to cutils/android_get_control_file.h" 2016-11-17 15:22:14 +00:00
Daichi Hirono
e76c5dfc23 Merge "Remove FuseBridgeLoop class." am: 5368723cf3 am: f5964b5cf9
am: b2e243be48

Change-Id: I41263e1f0150172206127d1a8ee69da1f8c7f1b8
2016-11-17 04:51:55 +00:00
Daichi Hirono
b2e243be48 Merge "Remove FuseBridgeLoop class." am: 5368723cf3
am: f5964b5cf9

Change-Id: I83e808886bcc4dc7dc9774ac4e8be10458b46955
2016-11-17 04:44:23 +00:00
Daichi Hirono
f5964b5cf9 Merge "Remove FuseBridgeLoop class."
am: 5368723cf3

Change-Id: I0d1c7f9a16a9f170288f9f542e5b485717aa0141
2016-11-17 04:36:23 +00:00
Treehugger Robot
5368723cf3 Merge "Remove FuseBridgeLoop class." 2016-11-17 04:22:27 +00:00
Wei Wang
499c992d82 Merge changes from topic 'slow_log' am: 2369b1eb80 am: b00b28ab9c
am: a24dde686a

Change-Id: I69e99e9a4351fc143d5da2fa23e4b13d6fbbc5a8
2016-11-17 04:11:05 +00:00
Wei Wang
86e7b8c3c8 init: fix undefined behavior in ExecuteCommand am: d67a4abc64 am: 279f3d593f
am: 737d0f5265

Change-Id: Icc5e6a269e75df1ab1b114fc1d63010ac7487cf1
2016-11-17 04:10:59 +00:00
Wei Wang
68a66a3e31 Revert "Revert "init: warn slow action"" am: 8b1d526a72 am: 3567c7c9d9
am: 67396253f2

Change-Id: I13ed33265460b8355b11a84f70cfb291ba6ed5cf
2016-11-17 04:10:52 +00:00
Wei Wang
a24dde686a Merge changes from topic 'slow_log' am: 2369b1eb80
am: b00b28ab9c

Change-Id: I70ebf8d1c7ed2f9a5e3be5973aaeec5c229b018c
2016-11-17 04:03:34 +00:00
Wei Wang
737d0f5265 init: fix undefined behavior in ExecuteCommand am: d67a4abc64
am: 279f3d593f

Change-Id: I56f463ed8b8af57993c180181a63e84f0a0eb49e
2016-11-17 04:03:28 +00:00
Wei Wang
67396253f2 Revert "Revert "init: warn slow action"" am: 8b1d526a72
am: 3567c7c9d9

Change-Id: I65c3e5d7d919ca80e794b731cf8e24b19945df2c
2016-11-17 04:03:22 +00:00
Wei Wang
b00b28ab9c Merge changes from topic 'slow_log'
am: 2369b1eb80

Change-Id: Ib714a9e9cd22bca570399604a2b4ea3d6cfe9ed3
2016-11-17 03:54:58 +00:00
Wei Wang
279f3d593f init: fix undefined behavior in ExecuteCommand
am: d67a4abc64

Change-Id: I1ecbb1d083af62dd5e69b4cff19ec411016054f3
2016-11-17 03:54:57 +00:00
Wei Wang
3567c7c9d9 Revert "Revert "init: warn slow action""
am: 8b1d526a72

Change-Id: Ie067e37758ae28fece1732ab7697e2a1286594dc
2016-11-17 03:54:51 +00:00
Wei Wang
2369b1eb80 Merge changes from topic 'slow_log'
* changes:
  init: fix undefined behavior in ExecuteCommand
  Revert "Revert "init: warn slow action""
2016-11-17 03:46:44 +00:00
Daichi Hirono
6d0e37cf1b Merge "Stops the loop when all files are closed." am: d8d7fc6717 am: 920b02906f
am: ac982d2644

Change-Id: I2701ed231c58f2adeebfba3c6302586432f19a59
2016-11-17 03:15:08 +00:00
Daichi Hirono
ac982d2644 Merge "Stops the loop when all files are closed." am: d8d7fc6717
am: 920b02906f

Change-Id: If2d271322d717b2fc530dcc11d7b341d886f1212
2016-11-17 03:06:38 +00:00
Daichi Hirono
920b02906f Merge "Stops the loop when all files are closed."
am: d8d7fc6717

Change-Id: If42cde1e5e4026915e5bc2e773ac6ff46aa9a8d9
2016-11-17 02:58:37 +00:00
Treehugger Robot
d8d7fc6717 Merge "Stops the loop when all files are closed." 2016-11-17 02:49:05 +00:00
Daichi Hirono
691739b334 Remove FuseBridgeLoop class.
Bug: 32779923
Test: libappfuse_test
Change-Id: I29a76701d141ae061ec1fe32993d27460a0c694a
2016-11-17 09:49:51 +09:00
Daichi Hirono
30e6808895 Stops the loop when all files are closed.
The CL changes FuseBridgeLoop so that it exits when all files opened on
the AppFuse mount point are closed. Note that the client code will
unmount the FUSE mount point after the loop exits.

Bug: 32260320
Test: libappfuse_test
Change-Id: I4965fbb48de8a280c6306e70757a07376b1956a7
2016-11-17 09:10:53 +09:00
Mark Salyzyn
52bd37e633 libcutils: move cutils/files.h to cutils/android_get_control_file.h
files.[h|cpp] is bound to be abused with junk, replace with
android_get_control_file.[h|cpp]. Plus some sundry cleanup.

Test: gTest libcutils-tests, logd-unit-tests, liblog-unit-tests,
      logcat-unit-tests and init_tests
Bug: 32450474
Change-Id: Ibd4a7aa4624ea19a43d1f98a3c71ac37805d36b5
2016-11-16 15:56:56 -08:00
Wei Wang
d67a4abc64 init: fix undefined behavior in ExecuteCommand
ExecuteCommand may change command_ vector which leads undefined behavior
This bug is found when adding logs in ExecuteCommand printing our Command class fields

Bug: 32838381
Test: on emulator
Change-Id: I96468bd2192ca80013871a3a6ac4132149363fff
2016-11-16 15:46:19 -08:00
Josh Gao
e6a6e6c80a Merge "adb: add sysdeps/chrono.h for chrono literals on Win32." am: e631e470e0 am: 27bbe8bfb2
am: c98fa1a51c

Change-Id: Id5bacbbd65da901e2d7918c44dc5c578dd8b809e
2016-11-16 22:45:01 +00:00
Josh Gao
c98fa1a51c Merge "adb: add sysdeps/chrono.h for chrono literals on Win32." am: e631e470e0
am: 27bbe8bfb2

Change-Id: Ib5069a8811f8c5e4b21cc849f9e57c4c4d488276
2016-11-16 22:37:29 +00:00
Josh Gao
27bbe8bfb2 Merge "adb: add sysdeps/chrono.h for chrono literals on Win32."
am: e631e470e0

Change-Id: Ie62e995d9790bf7539f3f9fca05de7b4b359dc7c
2016-11-16 22:29:30 +00:00
Jeff Sharkey
ff5f7a6e05 Merge "Only restorecon CE storage after unlocked." am: cfd12251bd am: a4f66b6623
am: dd8f40625d

Change-Id: I7a607cf04865431a5b5c767ebdc6e6ded1619612
2016-11-16 22:29:30 +00:00
Jeff Sharkey
dd8f40625d Merge "Only restorecon CE storage after unlocked." am: cfd12251bd
am: a4f66b6623

Change-Id: Ibfcd9cd102fd6cf46f795865a1dc3259471eff78
2016-11-16 22:22:29 +00:00
Treehugger Robot
e631e470e0 Merge "adb: add sysdeps/chrono.h for chrono literals on Win32." 2016-11-16 22:21:41 +00:00
Jeff Sharkey
a4f66b6623 Merge "Only restorecon CE storage after unlocked."
am: cfd12251bd

Change-Id: If1774db6602436c7c35c72a758155df5c59481cb
2016-11-16 22:14:29 +00:00
Treehugger Robot
cfd12251bd Merge "Only restorecon CE storage after unlocked." 2016-11-16 22:04:50 +00:00
Jeff Sharkey
d1d3bdd16f Only restorecon CE storage after unlocked.
On FBE devices, the filenames inside credential-encrypted directories
are mangled until the key is installed.  This means the initial
restorecon at boot needs to skip these directories until the keys
are installed.

This CL changes the implementation of the "restorecon_recursive"
built-in command to use the new SKIPCE flag to avoid labeling files
in CE directories.  vold will request a restorecon when the keys
are actually installed.

(cherrypicked from commit 1635afe83d)

Bug: 30126557
Test: Cherry-picked from master
Change-Id: I320584574a4d712c493b5bbd8a79b56c0c04aa58
2016-11-16 21:19:17 +00:00
Prashant Malani
019eab30ac fs_mgr: Fix disable-verity for verifyatboot partitions am: dd78ae75ff
am: afa252cc40

Change-Id: I464a044ba086aa26d3f5afd799c3c76043f833cb
2016-11-16 21:15:08 +00:00
Prashant Malani
afa252cc40 fs_mgr: Fix disable-verity for verifyatboot partitions
am: dd78ae75ff

Change-Id: Ib59af63d80d92a04c5dbc16e5d81cd261475f064
2016-11-16 21:07:23 +00:00
Elliott Hughes
ddf87aadb3 Merge "Switch adb over to <chrono>." am: 59826ddee5 am: 2278b50f24
am: bd51a0d30d

Change-Id: I5371f94c6b5adc626bdd5bc322b183dcb6ab40f3
2016-11-16 20:29:22 +00:00
Elliott Hughes
bd51a0d30d Merge "Switch adb over to <chrono>." am: 59826ddee5
am: 2278b50f24

Change-Id: I91e3f9d5784d3c7110a605115b247f71f68d6fe3
2016-11-16 20:21:51 +00:00
Josh Gao
4602adbcd3 adb: add sysdeps/chrono.h for chrono literals on Win32.
Bug: http://b/32878766
Test: mma
Change-Id: Iaa89d4eadf07e63d6d7205057435a6c7fb5d4ec5
2016-11-16 12:14:59 -08:00
Elliott Hughes
2278b50f24 Merge "Switch adb over to <chrono>."
am: 59826ddee5

Change-Id: I673ce3c9f4a104df3197ec7120a126155e18918e
2016-11-16 20:14:20 +00:00
Treehugger Robot
59826ddee5 Merge "Switch adb over to <chrono>." 2016-11-16 20:05:52 +00:00
Elliott Hughes
dbe91eee26 Switch adb over to <chrono>.
Clearer code, and lets us lose some more portability cruft.

Bug: http://b/32878766
Test: manual
Change-Id: Ie44928bbf8d68a74127aaf76e7e0060e25fa2cc8
2016-11-16 09:12:12 -08:00
Daichi Hirono
2b73980091 Merge "Use FUSE_COMPAT_22_INIT_OUT_SIZE always as the resopnse size of FUSE_INIT." am: 0673412bb9 am: 357876455c
am: 5f7ed2dd60

Change-Id: I911e9d23eefbadb703b4e285bb61269086f4c147
2016-11-16 08:10:26 +00:00
Daichi Hirono
5f7ed2dd60 Merge "Use FUSE_COMPAT_22_INIT_OUT_SIZE always as the resopnse size of FUSE_INIT." am: 0673412bb9
am: 357876455c

Change-Id: I242c3f8f7e65c78446bb145db6035e28287cd917
2016-11-16 08:02:24 +00:00
Wei Wang
8b1d526a72 Revert "Revert "init: warn slow action""
This reverts commit 1802d11cc7.

Test: grep init log
Bug: 32712851
2016-11-15 23:58:55 -08:00
Daichi Hirono
357876455c Merge "Use FUSE_COMPAT_22_INIT_OUT_SIZE always as the resopnse size of FUSE_INIT."
am: 0673412bb9

Change-Id: I85e6be67fdd5285c2abc26a097301c7136a676f9
2016-11-16 07:54:10 +00:00
Treehugger Robot
0673412bb9 Merge "Use FUSE_COMPAT_22_INIT_OUT_SIZE always as the resopnse size of FUSE_INIT." 2016-11-16 07:46:44 +00:00
Tao Bao
d76eb17eef Merge "Update to new minui text API" am: 335502453d -s ours am: b6a8454cd5
am: 11c19d9b15

Change-Id: I127c9ca62f59dff9c03d9e48a30649e7806e831c
2016-11-16 07:16:17 +00:00
Tao Bao
11c19d9b15 Merge "Update to new minui text API" am: 335502453d -s ours
am: b6a8454cd5

Change-Id: I29a733b45b7393854363b4d3cf82462bad04dbf0
2016-11-16 07:08:45 +00:00