Rick Yiu
85c9d7758d
Merge "Add blkio cgroup to libprocessgroup" am: d5345f58fd
...
am: b6d02ff175
Change-Id: Ic28a998d3269af30244036e11c40ad568e58700e
2019-02-27 05:20:15 -08:00
Rick Yiu
b6d02ff175
Merge "Add blkio cgroup to libprocessgroup"
...
am: d5345f58fd
Change-Id: Ifb3b3e1d602f8bb4b9f3c29b4c9a4e502ad76271
2019-02-27 05:15:54 -08:00
Rick Yiu
e9d149fd7e
Unify some text format in task_profiles.json
...
Bug: 111307099
Test: cgroup function is normal
Change-Id: Id992b875720ff67a5d1a2b052072ee7ea7b16a9a
2019-02-27 21:08:19 +08:00
Treehugger Robot
d5345f58fd
Merge "Add blkio cgroup to libprocessgroup"
2019-02-27 13:04:00 +00:00
Wei Wang
7edfcaaab7
Merge "Fix string reference usage" am: 55d36240dc
...
am: 140c3b6202
Change-Id: Iebbc3f973b482387431e2110103cf2db671bbfef
2019-02-27 04:56:32 -08:00
Wei Wang
140c3b6202
Merge "Fix string reference usage"
...
am: 55d36240dc
Change-Id: I9aa3118ba3497b2169f1acae24841a06e0f9455b
2019-02-27 04:39:26 -08:00
Treehugger Robot
55d36240dc
Merge "Fix string reference usage"
2019-02-27 11:04:30 +00:00
Wei Wang
1770566de6
Fix string reference usage
...
Bug: 124774415
Test: Build
Change-Id: Ic0e5ee4f3375c2fa21fbc2ce3796b7368e9e289c
2019-02-27 06:04:13 +00:00
Bowgo Tsai
f3e28e1682
libfs_avb: support key rotation for standalone partitions
...
The FstabEntry.avb_key is renamed to FstabEntry.avb_keys, to
allow specifying multiple avb keys, separated by ':'
(because ',' is already used by fstab parsing).
Bug: 124013032
Test: boot live GSI with multiple allowed AVB keys
Change-Id: Iacd3472a1d5a659dfecf09ea6074d622658f4d0b
2019-02-27 04:13:21 +00:00
Rick Yiu
2b3bf84373
Add blkio cgroup to libprocessgroup
...
To differentiate IO priority for different groups.
Bug: 111422845
Bug: 117857342
Test: tasks are assigned to the group as expected
Change-Id: Ibb108d1b8e0f720f7ac4cab248b3c33d35e5483d
2019-02-27 11:23:14 +08:00
Mark Salyzyn
5ae0b4246d
Merge "fs_mgr: overlayfs: requires override_creds patch for 4.4+ kernels (taimen)" am: df3f38f6c9
...
am: 7a2029363d
Change-Id: Ie80bbdbc5d0676655d0301830872bb78d8dd8c2c
2019-02-26 17:50:50 -08:00
Mark Salyzyn
7a2029363d
Merge "fs_mgr: overlayfs: requires override_creds patch for 4.4+ kernels (taimen)"
...
am: df3f38f6c9
Change-Id: Ic6db2a4cfb1bedd1e768abf671208fa32e5c8354
2019-02-26 17:36:36 -08:00
Treehugger Robot
df3f38f6c9
Merge "fs_mgr: overlayfs: requires override_creds patch for 4.4+ kernels (taimen)"
2019-02-27 01:18:23 +00:00
Elliott Hughes
1bf8a30696
Merge "Add `test_suites` to libutils_test." am: bc94667e8e
...
am: 2eca1f4bf0
Change-Id: Ie4bf24cc5fcc23f51d83c7b2ae8ea911a8bf411a
2019-02-26 14:48:25 -08:00
Elliott Hughes
2eca1f4bf0
Merge "Add `test_suites` to libutils_test."
...
am: bc94667e8e
Change-Id: I7cff1afd6f7b2a4b3572917fd3cdb3b63e4834e3
2019-02-26 14:43:08 -08:00
Elliott Hughes
bc94667e8e
Merge "Add `test_suites` to libutils_test."
2019-02-26 22:31:26 +00:00
Josh Gao
093d5c34a5
Merge "Revert "adbd: switch the default USB implementation."" am: c2970282cb
...
am: b7d775866c
Change-Id: Idf5e30a236b394fcae7072e3f10a171dc549fb86
2019-02-26 14:29:36 -08:00
Josh Gao
b7d775866c
Merge "Revert "adbd: switch the default USB implementation.""
...
am: c2970282cb
Change-Id: I55b9fa99642980d229623b0b1231b448b79f97b6
2019-02-26 14:21:23 -08:00
Josh Gao
c2970282cb
Merge "Revert "adbd: switch the default USB implementation.""
2019-02-26 22:15:40 +00:00
Josh Gao
0d780391a1
Revert "adbd: switch the default USB implementation."
...
This reverts commit 12f328489b
.
Reason for revert: possibly causing b/126388431
Change-Id: Ida7c30a92f552f923f3bcb153d945d58ebbc4257
2019-02-26 22:10:33 +00:00
Josh Gao
d575bc93a5
Merge changes I86c3ec0f,I57d1a30a,Ib50d289b,I791a4f82,I316a8799, ... am: 216d158daf
...
am: ff7b56f917
Change-Id: I8dbbc43a2690cd35528dae59a3625c5288dc7a64
2019-02-26 13:21:03 -08:00
Josh Gao
ff7b56f917
Merge changes I86c3ec0f,I57d1a30a,Ib50d289b,I791a4f82,I316a8799, ...
...
am: 216d158daf
Change-Id: I44e6f7071425d4d4e627d336a7ba07b5314a2643
2019-02-26 13:13:07 -08:00
Nicolas Geoffray
f2472a1d72
Merge "Add a DEX2OAT_BOOTCLASSPATH variable." am: 1706eb08fe
...
am: e25fa6da1b
Change-Id: Iac2edb56374e571a3a741edfa9279a82a63f50f8
2019-02-26 13:10:39 -08:00
Nicolas Geoffray
e25fa6da1b
Merge "Add a DEX2OAT_BOOTCLASSPATH variable."
...
am: 1706eb08fe
Change-Id: I99097127c5742c2184366a061cf5e69648f53a29
2019-02-26 13:02:04 -08:00
Josh Gao
216d158daf
Merge changes I86c3ec0f,I57d1a30a,Ib50d289b,I791a4f82,I316a8799, ...
...
* changes:
adb: switch sockets.cpp to ConsumePrefix.
adbd: switch abb to ConsumePrefix.
adb: increment server version.
adb: wait for device to disconnect upon `adb root`.
adb: implement wait-for-disconnect.
adb: tell the client what transport it received.
adbd: switch daemon/services to ConsumePrefix.
adb: switch host_service_to_socket to string_view.
adb: switch handle_host_request to string_view.
adb: switch adb_io.h to string_view.
adb: add helper to consume a prefix on a string_view.
adb: make ParseUint reject garbage at the end by default.
2019-02-26 20:55:19 +00:00
Nicolas Geoffray
1706eb08fe
Merge "Add a DEX2OAT_BOOTCLASSPATH variable."
2019-02-26 20:38:32 +00:00
David Anderson
9fb4aaa1a7
Merge "Allow fiemap_writer_test to run in arbitrary directories." am: e99564fc62
...
am: 58fc986bd1
Change-Id: I050833d59d58e6e545f5f97fce14735a40d08e2e
2019-02-26 11:49:32 -08:00
David Anderson
58fc986bd1
Merge "Allow fiemap_writer_test to run in arbitrary directories."
...
am: e99564fc62
Change-Id: I90dd03e7a6e6a6916c2b3d1d1866a944cc097345
2019-02-26 11:46:24 -08:00
David Anderson
e99564fc62
Merge "Allow fiemap_writer_test to run in arbitrary directories."
2019-02-26 19:33:36 +00:00
Martin Stjernholm
bc43c7c05d
Merge "Fix libdexfile dependencies to avoid direct dependency on libdexfile_external." am: 21c29cfade
...
am: e6ab117292
Change-Id: I564f0e3a18a9b6f0842303fdc6ce8ea76277e3c5
2019-02-26 09:34:52 -08:00
Martin Stjernholm
e6ab117292
Merge "Fix libdexfile dependencies to avoid direct dependency on libdexfile_external."
...
am: 21c29cfade
Change-Id: I1526f70910aa0ecd49d303bc848a3d08e4aa7a76
2019-02-26 09:30:44 -08:00
Treehugger Robot
21c29cfade
Merge "Fix libdexfile dependencies to avoid direct dependency on libdexfile_external."
2019-02-26 17:19:42 +00:00
Mark Salyzyn
a9451a5db1
fs_mgr: overlayfs: requires override_creds patch for 4.4+ kernels (taimen)
...
The original adb-remount-test.sh when certifying kernels allowed a
pass on 4.4 kernels because it added new content, and missed a test
for overriding existing content. When the test was added to confirm
APEX control of libc.so, it serendipitously added a check for
overriding existing content, which the 4.4 kernel did not allow to
pass. Update the tests and documentation to reflect this new state
of affairs.
Summary: 4.4 kernel overlayfs driver worked partially without the
patch for override_creds.
Test: adb-remount-test.sh
Bug: 126256072
Change-Id: I979ea59a12bc0b9926826b9b09a7893ab3b9ee7f
2019-02-26 08:45:17 -08:00
Nicolas Geoffray
0c49d1759c
Add a DEX2OAT_BOOTCLASSPATH variable.
...
Bug: 119800099
Test: m
Change-Id: I8ae4ecea6da2ef541736a38822b100a620d72a8a
2019-02-26 12:57:17 +00:00
Juju Sung
e8cce305b4
Merge "lmkd: Remove redundant free swap and free memory check" am: 89a7cc48cc
...
am: ab0319ece8
Change-Id: I727d624f1149452ce755c0145f13a286f6422048
2019-02-26 02:54:06 -08:00
Juju Sung
ab0319ece8
Merge "lmkd: Remove redundant free swap and free memory check"
...
am: 89a7cc48cc
Change-Id: I905a1d573d2fa66588a4dd436f4d1bd4cdf009ff
2019-02-26 02:08:59 -08:00
Treehugger Robot
89a7cc48cc
Merge "lmkd: Remove redundant free swap and free memory check"
2019-02-26 09:53:31 +00:00
Josh Gao
d4c49c4b44
Merge "adbd: switch the default USB implementation." am: 5782600271
...
am: 269ef5d068
Change-Id: I479f1de000ad2c9732550e0dc78a23ece811ff16
2019-02-26 01:03:36 -08:00
Mark Salyzyn
b891c46282
Merge "fs_mgr: overlayfs: system as root can not detect shared blocks (taimen)" am: a24338bff8
...
am: 7880279ac6
Change-Id: I3aaf4b4506432f5f0a3c82e053886b3e78e65c60
2019-02-26 00:15:32 -08:00
Josh Gao
269ef5d068
Merge "adbd: switch the default USB implementation."
...
am: 5782600271
Change-Id: Idbc6eba721e06bfa4659f2aac1592f6bdf84a9a5
2019-02-26 00:12:43 -08:00
Bowgo Tsai
9dc08bd409
Merge changes from topic "fs_mgr_unit_test" am: 6d6ccdf7c6
...
am: b45e01bdd3
Change-Id: Idc3b23df9b087b578e8904139aefd09a49fce84d
2019-02-25 23:54:32 -08:00
Paul Trautrim
e0be5694c4
Merge "fiemap_writer: Use fallocate64" am: 032b744809
...
am: 06df12ba3b
Change-Id: Ifc1c6e48c1320171632bc7dfe6679cb4006f3f6a
2019-02-25 23:45:25 -08:00
Mark Salyzyn
4f9a05b878
Merge "fs_mgr: overlayfs: test: Add --print-time option" am: 3be9bff517
...
am: d36d052a20
Change-Id: Ia6f7bdcfe562d0119c6ace5c7f453fc927417cbf
2019-02-25 23:28:43 -08:00
Mark Salyzyn
7880279ac6
Merge "fs_mgr: overlayfs: system as root can not detect shared blocks (taimen)"
...
am: a24338bff8
Change-Id: I14c0c136c362dff252ea7d1ffbff7a054e4686d9
2019-02-25 23:27:06 -08:00
Bowgo Tsai
b45e01bdd3
Merge changes from topic "fs_mgr_unit_test"
...
am: 6d6ccdf7c6
Change-Id: I5dbb8cc6871d76d0a8608ff4db368e5865686742
2019-02-25 23:20:47 -08:00
Paul Trautrim
06df12ba3b
Merge "fiemap_writer: Use fallocate64"
...
am: 032b744809
Change-Id: Icca45dde6e0e7e15eddb456da641167d1d401cd7
2019-02-25 23:12:59 -08:00
Mark Salyzyn
d36d052a20
Merge "fs_mgr: overlayfs: test: Add --print-time option"
...
am: 3be9bff517
Change-Id: I7026f55a132445115b078e19d3bac547c923fac8
2019-02-25 23:08:58 -08:00
Neil Fuller
6916a8fc05
Merge "Move tzdatacheck execution after apex is mounted" am: 61b2016881
...
am: 3305192d3a
Change-Id: Ibd10e2778c66dd7a4ff3d1139f5a783405d73941
2019-02-25 23:02:41 -08:00
Neil Fuller
3305192d3a
Merge "Move tzdatacheck execution after apex is mounted"
...
am: 61b2016881
Change-Id: Ib8b0773a2abed59a7464a1eab034db394b9b2c53
2019-02-25 22:51:17 -08:00
Josh Gao
5782600271
Merge "adbd: switch the default USB implementation."
2019-02-26 06:47:46 +00:00