6abe26cdf4
Merge "storaged: add task io to dump service"
2017-07-26 22:47:42 +00:00
3906c89206
storaged: add task io to dump service
...
Display task io in dump service when both kernel logs task io to
proc/uid_io/stats and when debug flag is enabled.
Also add -t flag to display both uid and task io for storaged.
Tests:
adb shell
dumpsys storaged --debug
storaged -t
Bug: 63739275
Change-Id: If0c9814892ad61b790baa6395649af10b11d5b7c
2017-07-26 12:46:08 -07:00
e2f94b99ee
Merge "Add definition of off64_t for mac os builds" am: 3e0b594619 am: 0b60b181c4 am: e88c6633af am: 51ea165065
...
am: 50db425c17
2017-07-26 01:46:19 +00:00
50db425c17
Merge "Add definition of off64_t for mac os builds" am: 3e0b594619 am: 0b60b181c4 am: e88c6633af
...
am: 51ea165065
2017-07-26 00:56:17 +00:00
51ea165065
Merge "Add definition of off64_t for mac os builds" am: 3e0b594619 am: 0b60b181c4
...
am: e88c6633af
2017-07-26 00:15:35 +00:00
e88c6633af
Merge "Add definition of off64_t for mac os builds" am: 3e0b594619
...
am: 0b60b181c4
2017-07-26 00:12:03 +00:00
0b60b181c4
Merge "Add definition of off64_t for mac os builds"
...
am: 3e0b594619
2017-07-26 00:08:34 +00:00
3e0b594619
Merge "Add definition of off64_t for mac os builds"
2017-07-25 23:55:00 +00:00
5fff67f2ec
Add definition of off64_t for mac os builds
...
Mac OS does not define off64_t, since off_t is always 64 bit.
Test: manual
Change-Id: Ib02a912a2eaf38143e124f2b6aaf294ecf84ff88
2017-07-25 16:26:23 -07:00
a3ab7ebc2d
Merge "libziparchive: Use ReadAtOffset exclusively" am: a0360ad6a3 am: 67a3a88c24 am: 0d4fcc5fc9 am: 018fca3c95
...
am: 607e80599a
2017-07-25 23:07:31 +00:00
16f13d01f2
Merge "Remove LOCAL_CLANG and clang: true" am: 80ec81cf4b am: f7b315c985 am: 8a8b97b271 am: e1332dd01b
...
am: 6da3de27be
2017-07-25 23:06:37 +00:00
607e80599a
Merge "libziparchive: Use ReadAtOffset exclusively" am: a0360ad6a3 am: 67a3a88c24 am: 0d4fcc5fc9
...
am: 018fca3c95
2017-07-25 22:40:50 +00:00
6da3de27be
Merge "Remove LOCAL_CLANG and clang: true" am: 80ec81cf4b am: f7b315c985 am: 8a8b97b271
...
am: e1332dd01b
2017-07-25 22:39:58 +00:00
018fca3c95
Merge "libziparchive: Use ReadAtOffset exclusively" am: a0360ad6a3 am: 67a3a88c24
...
am: 0d4fcc5fc9
2017-07-25 22:36:11 +00:00
e1332dd01b
Merge "Remove LOCAL_CLANG and clang: true" am: 80ec81cf4b am: f7b315c985
...
am: 8a8b97b271
2017-07-25 22:35:56 +00:00
0d4fcc5fc9
Merge "libziparchive: Use ReadAtOffset exclusively" am: a0360ad6a3
...
am: 67a3a88c24
2017-07-25 22:33:44 +00:00
8a8b97b271
Merge "Remove LOCAL_CLANG and clang: true" am: 80ec81cf4b
...
am: f7b315c985
2017-07-25 22:33:27 +00:00
67a3a88c24
Merge "libziparchive: Use ReadAtOffset exclusively"
...
am: a0360ad6a3
2017-07-25 22:29:13 +00:00
f7b315c985
Merge "Remove LOCAL_CLANG and clang: true"
...
am: 80ec81cf4b
2017-07-25 22:28:56 +00:00
a0360ad6a3
Merge "libziparchive: Use ReadAtOffset exclusively"
2017-07-25 22:22:21 +00:00
80ec81cf4b
Merge "Remove LOCAL_CLANG and clang: true"
2017-07-25 22:20:23 +00:00
3f47ba9c9b
Merge "Add thread safety analysis annotations." am: e7ce8c8485 am: f23f21a231 am: a0e5e3abce am: 097965e76e
...
am: d374e3bad0
2017-07-25 21:55:36 +00:00
ec6eb77068
Do not umount roofs even if it is R/W. am: b7a8764a12 am: ba6705f9de
...
am: 4c95acb435
2017-07-25 21:55:15 +00:00
8c7fdfd326
Do not umount roofs even if it is R/W. am: b7a8764a12 am: f56456515d
...
am: 1b2afd512a
2017-07-25 21:54:56 +00:00
d374e3bad0
Merge "Add thread safety analysis annotations." am: e7ce8c8485 am: f23f21a231 am: a0e5e3abce
...
am: 097965e76e
2017-07-25 21:54:24 +00:00
097965e76e
Merge "Add thread safety analysis annotations." am: e7ce8c8485 am: f23f21a231
...
am: a0e5e3abce
2017-07-25 21:50:24 +00:00
a0e5e3abce
Merge "Add thread safety analysis annotations." am: e7ce8c8485
...
am: f23f21a231
2017-07-25 21:46:53 +00:00
f23f21a231
Merge "Add thread safety analysis annotations."
...
am: e7ce8c8485
2017-07-25 21:42:54 +00:00
4c95acb435
Do not umount roofs even if it is R/W. am: b7a8764a12
...
am: ba6705f9de
2017-07-25 21:42:36 +00:00
1b2afd512a
Do not umount roofs even if it is R/W. am: b7a8764a12
...
am: f56456515d
2017-07-25 21:38:50 +00:00
e7ce8c8485
Merge "Add thread safety analysis annotations."
2017-07-25 21:37:27 +00:00
f56456515d
Do not umount roofs even if it is R/W.
...
am: b7a8764a12
2017-07-25 21:35:06 +00:00
ba6705f9de
Do not umount roofs even if it is R/W.
...
am: b7a8764a12
2017-07-25 21:34:50 +00:00
43e6ea22aa
Merge "Do not umount roofs even if it is R/W." am: 43567e39dc am: 22782a7269 am: 34e13498dc am: 081c1921e0
...
am: 4cca10cf7e
2017-07-25 21:01:52 +00:00
4cca10cf7e
Merge "Do not umount roofs even if it is R/W." am: 43567e39dc am: 22782a7269 am: 34e13498dc
...
am: 081c1921e0
2017-07-25 20:51:18 +00:00
081c1921e0
Merge "Do not umount roofs even if it is R/W." am: 43567e39dc am: 22782a7269
...
am: 34e13498dc
2017-07-25 20:47:48 +00:00
34e13498dc
Merge "Do not umount roofs even if it is R/W." am: 43567e39dc
...
am: 22782a7269
2017-07-25 20:44:21 +00:00
e3609e4cdf
Merge "init: add support for global seccomp boot option" am: 9f1980e2fc am: 5a79972238 am: eb7db75c28 am: aa4bb9552f
...
am: c2548ea392
2017-07-25 20:42:33 +00:00
22782a7269
Merge "Do not umount roofs even if it is R/W."
...
am: 43567e39dc
2017-07-25 20:41:19 +00:00
c2548ea392
Merge "init: add support for global seccomp boot option" am: 9f1980e2fc am: 5a79972238 am: eb7db75c28
...
am: aa4bb9552f
2017-07-25 20:36:49 +00:00
43567e39dc
Merge "Do not umount roofs even if it is R/W."
2017-07-25 20:35:50 +00:00
aa4bb9552f
Merge "init: add support for global seccomp boot option" am: 9f1980e2fc am: 5a79972238
...
am: eb7db75c28
2017-07-25 20:33:53 +00:00
eb7db75c28
Merge "init: add support for global seccomp boot option" am: 9f1980e2fc
...
am: 5a79972238
2017-07-25 20:30:30 +00:00
5a79972238
Merge "init: add support for global seccomp boot option"
...
am: 9f1980e2fc
2017-07-25 20:26:29 +00:00
9f1980e2fc
Merge "init: add support for global seccomp boot option"
2017-07-25 20:18:51 +00:00
b7a8764a12
Do not umount roofs even if it is R/W.
...
Latest device has rootfs instead of "/system" mount point
(cherry picked from commit a01c27eef8
2017-07-25 11:39:22 -07:00
de117e4a49
libziparchive: Use ReadAtOffset exclusively
...
The use of ReadAtOffset is meant to allow concurrent access
to the zip archive once it has been loaded. There were places
where this was the case, and some places that did a seek + read
combination, which could lead to data races.
NOTE: On Windows, we are not using pread as the implementation of
ReadAtOffset, therefore the guarantees on Windows are weaker.
On Linux, pread allows the file descriptor to be read at a specific
offset without changing the read pointer. This allows inherited fd's
and duped fds to be read concurrently.
On Windows, we use the ReadFile API, which allows for an atomic seek +
read operation, but modifies the read pointer. This means that any mix
use of ReadAtOffset and Read will have races. Just using ReadAtOffset is
safe.
For the Windows case, this is fine as the libziparchive code now only
uses ReadAtOffset.
Bug: 62184114
Bug: 62101783
Test: make ziparchive-tests (existing tests pass)
Change-Id: Ia7f9a30af2216682cdd9d578d26e84bc46773bb9
2017-07-25 18:12:12 +00:00
a01c27eef8
Do not umount roofs even if it is R/W.
...
Latest device has rootfs instead of "/system" mount point
Bug: 37737296
Test: adb remount, reboot, and check log
Change-Id: I315ecf71e85255fc55c3a80619920b456bad0956
2017-07-25 10:55:10 -07:00
9de83f7370
Merge "DO NOT MERGE ANYWHERE tombstoned: Avoid creating the tombstoned_java_trace socket." into oc-dr1-dev am: 53ce94588b -s ours am: 8df2973166 -s ours
...
am: cc1f85a49a
2017-07-25 15:24:33 +00:00
492ec06266
Merge "DO NOT MERGE ANYWHERE tombstoned: Avoid creating the tombstoned_java_trace socket." into oc-dr1-dev am: 53ce94588b -s ours am: 385a5dc03a -s ours
...
am: 35060e1034
2017-07-25 15:24:17 +00:00
Jin Qian