Elliott Hughes
8e5fb5a0e7
Merge "Remove dead code."
...
am: 3bde05d928
2016-11-17 20:39:22 +00:00
Treehugger Robot
3bde05d928
Merge "Remove dead code."
2016-11-17 20:29:10 +00:00
Wei Wang
5514c50292
Merge "init: move empty string check to InitTriggers"
...
am: 9bf10ff61e
2016-11-17 19:32:19 +00:00
Wei Wang
9bf10ff61e
Merge "init: move empty string check to InitTriggers"
2016-11-17 19:21:47 +00:00
Elliott Hughes
284f07bd9d
Remove dead code.
...
At this point, we can't write to oom_score_adj anyway.
Bug: https://code.google.com/p/android/issues/detail?id=227721
Test: boots, adb shell still works
Change-Id: I07e6ad32765f6582f316973547a3a3d552808287
2016-11-17 10:32:16 -08:00
Paul Lawrence
ffa3689107
Merge "Add flags to restorecon_recursive to traverse filesystems"
...
am: 5fbd1cfd34
2016-11-17 17:55:06 +00:00
Treehugger Robot
5fbd1cfd34
Merge "Add flags to restorecon_recursive to traverse filesystems"
2016-11-17 17:39:53 +00:00
Mark Salyzyn
5a411029de
Merge "libcutils: sdk(mac) build error (part deux)"
...
am: ed0a48c617
2016-11-17 16:43:06 +00:00
Mark Salyzyn
ed0a48c617
Merge "libcutils: sdk(mac) build error (part deux)"
2016-11-17 16:36:21 +00:00
Mark Salyzyn
0958b18da0
libcutils: sdk(mac) build error (part deux)
...
Test: Build
Bug: 32450474
Change-Id: I92cca30217715779a9db6a60e2e4831a20cec3d4
2016-11-17 08:33:26 -08:00
Mark Salyzyn
7bc8810a4a
Merge "libcutils: sdk(mac) build error"
...
am: 231d1ac640
2016-11-17 16:19:34 +00:00
Mark Salyzyn
231d1ac640
Merge "libcutils: sdk(mac) build error"
2016-11-17 16:09:33 +00:00
Mark Salyzyn
6b652160d1
libcutils: sdk(mac) build error
...
Surprise surprise, MAC sdk build has F_GETFD & not TEMP_FAILURE_RETRY.
Revert code to original form with the three alternatives for all OSii.
Test: Build
Bug: 32450474
Change-Id: Ia7361d8107675a620968d8395c5e2351ad364d29
2016-11-17 08:05:16 -08:00
Mark Salyzyn
c8124d1592
Merge "logcat: add hidden --debug flag and cleanup"
...
am: c097c79b77
2016-11-17 15:33:19 +00:00
Mark Salyzyn
809dee506e
Merge "libcutils: move cutils/files.h to cutils/android_get_control_file.h"
...
am: 8c41e791ed
2016-11-17 15:33:02 +00:00
Treehugger Robot
c097c79b77
Merge "logcat: add hidden --debug flag and cleanup"
2016-11-17 15:23:05 +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
Wei Wang
93df4e18a2
init: move empty string check to InitTriggers
...
Test: mma
Bug: 32838381
Change-Id: I69203734ef7d3640da75f3e3cbe9254bf468d916
2016-11-16 22:24:43 -08:00
Daichi Hirono
f5964b5cf9
Merge "Remove FuseBridgeLoop class."
...
am: 5368723cf3
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
b00b28ab9c
Merge changes from topic 'slow_log'
...
am: 2369b1eb80
2016-11-17 03:54:58 +00:00
Wei Wang
279f3d593f
init: fix undefined behavior in ExecuteCommand
...
am: d67a4abc64
2016-11-17 03:54:57 +00:00
Wei Wang
3567c7c9d9
Revert "Revert "init: warn slow action""
...
am: 8b1d526a72
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
920b02906f
Merge "Stops the loop when all files are closed."
...
am: d8d7fc6717
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
Mark Salyzyn
538bc12c08
logcat: add hidden --debug flag and cleanup
...
Allow us to debug corrupted log messages. Fix liblog to propagate
errors correctly and repair a gtest that failed.
Test: liblog-unit-tests --gtest_filter=liblog.__android_log_bswrite_and_print___max
logcat -b events --debug -t 50
Bug: 32903864
Change-Id: Ib4eb9f466777cd23b8b54728d36354590d07869a
2016-11-16 15:46:42 -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
27bbe8bfb2
Merge "adb: add sysdeps/chrono.h for chrono literals on Win32."
...
am: e631e470e0
2016-11-16 22:29:30 +00:00
Paul Lawrence
a8d8434c42
Add flags to restorecon_recursive to traverse filesystems
...
Use to solve the problem of tracefs conditionally being mounted
under debugfs and needing restorecon'd without boot performance
penalty.
Also move skip-ce to a flag for consistency.
Test: Check that trace_mount has correct attributes after boot
Bug: 32849675
Change-Id: Ib6731f502b6afc393ea5ada96fa95b339f14da49
2016-11-16 22:27:45 +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
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
2016-11-16 21:19:17 +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
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
Wei Wang
8b1d526a72
Revert "Revert "init: warn slow action""
...
This reverts commit 1802d11cc7
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
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
b6a8454cd5
Merge "Update to new minui text API"
...
am: 335502453d
2016-11-16 07:00:47 +00:00
Tao Bao
335502453d
Merge "Update to new minui text API"
2016-11-16 05:52:18 +00:00
Daichi Hirono
c0a79ff4cf
Merge "Use FUSE_COMPAT_22_INIT_OUT_SIZE always if available."
...
am: c884f80755
2016-11-16 04:09:53 +00:00
Treehugger Robot
c884f80755
Merge "Use FUSE_COMPAT_22_INIT_OUT_SIZE always if available."
2016-11-16 03:57:46 +00:00
Ting-Yuan Huang
1700a162d5
Merge "init: fix memory leaks"
...
am: a73ba879b1
2016-11-16 03:32:40 +00:00
Treehugger Robot
a73ba879b1
Merge "init: fix memory leaks"
2016-11-16 03:25:34 +00:00
