OSDN Git Service
Jaegeuk Kim [Mon, 12 Aug 2019 19:16:09 +0000 (12:16 -0700)]
secdiscard: should call fsync to avoid reordering IOs am:
6c5e453f9e am:
732faaeb94
am:
ceac8b8587
Change-Id: I0681b3aba14a0723f904c5e9246811e035949130
Jaegeuk Kim [Mon, 12 Aug 2019 18:50:28 +0000 (11:50 -0700)]
secdiscard: should call fsync to avoid reordering IOs am:
6c5e453f9e
am:
732faaeb94
Change-Id: I8ae6f3b8e7950a9978741879d3b4ac344af61a60
Jaegeuk Kim [Mon, 12 Aug 2019 18:39:56 +0000 (11:39 -0700)]
secdiscard: should call fsync to avoid reordering IOs
am:
6c5e453f9e
Change-Id: I5710fcce302d040a29ff798df85bf71ef6e3fbb5
Jaegeuk Kim [Thu, 8 Aug 2019 16:07:58 +0000 (09:07 -0700)]
secdiscard: should call fsync to avoid reordering IOs
Don't make stale zero'ing IO in block device after unlink, since filesystem
can reuse the block addresses and issue some IOs. If block layer reordered
two IOs, filesystem will see zero data, which crashes filesystem consistency.
Bug:
136964285
Test: run cts -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.CrossProfileAppsHostSideTest
Change-Id: I43c13622d094cecda1c53468adc240002111d605
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
David Anderson [Sat, 13 Jul 2019 00:34:58 +0000 (17:34 -0700)]
Merge "libdm now requires linking to libext2_uuid." am:
9e821da9fe am:
e91c2686e9 am:
d26cb98c4d
am:
0be952d362
Change-Id: Icaa2f68ea5857df5dda76ebeb0ade0bbc9d26ccc
David Anderson [Sat, 13 Jul 2019 00:20:37 +0000 (17:20 -0700)]
Merge "libdm now requires linking to libext2_uuid." am:
9e821da9fe am:
e91c2686e9
am:
d26cb98c4d
Change-Id: Ie6988c9cdf17a1f36a4f9aa59544ba5f461d825b
David Anderson [Fri, 12 Jul 2019 23:53:04 +0000 (16:53 -0700)]
Merge "libdm now requires linking to libext2_uuid." am:
9e821da9fe
am:
e91c2686e9
Change-Id: I585749bae8d30931a164b5f2a7900fea2fe1aa29
David Anderson [Fri, 12 Jul 2019 23:25:24 +0000 (16:25 -0700)]
Merge "libdm now requires linking to libext2_uuid."
am:
9e821da9fe
Change-Id: Id33c9fc83352535cb45f27e70dec6000c73b07a5
David Anderson [Fri, 12 Jul 2019 23:03:41 +0000 (23:03 +0000)]
Merge "libdm now requires linking to libext2_uuid."
Xin Li [Wed, 10 Jul 2019 00:52:38 +0000 (17:52 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" am:
711f4faac3 -s ours am:
e7487087d0 -s ours am:
49304ac627
am:
ccf6d331b8 -s ours
am skip reason: subject contains skip directive
Change-Id: I0ee8d1638313ea45cf2bb8e1cdc315127eeb1d15
Xin Li [Wed, 10 Jul 2019 00:24:55 +0000 (17:24 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" am:
711f4faac3 -s ours am:
e7487087d0 -s ours
am:
49304ac627
Change-Id: I0ef4e364f9afe14cec3a1c9a6d389709bf2e59ce
Xin Li [Wed, 10 Jul 2019 00:21:16 +0000 (17:21 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am:
33080d8b49 -s ours am:
2c1e06e589 -s ours am:
4c373e4563
am:
1c4860773a -s ours
am skip reason: subject contains skip directive
Change-Id: Ib80d9941780b99f6bde1b0c5144bf7630ddb70db
Xin Li [Tue, 9 Jul 2019 23:52:34 +0000 (16:52 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am:
33080d8b49 -s ours am:
2c1e06e589 -s ours
am:
4c373e4563
Change-Id: If915398214afac55d629175c502dbaaa1a875f3c
Xin Li [Tue, 9 Jul 2019 23:27:56 +0000 (16:27 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" am:
711f4faac3 -s ours
am:
e7487087d0 -s ours
am skip reason: subject contains skip directive
Change-Id: I94ad8ca99f9a6b2aa522e8371794d43ae8840117
Xin Li [Tue, 9 Jul 2019 23:22:08 +0000 (16:22 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"
am:
711f4faac3 -s ours
am skip reason: subject contains skip directive
Change-Id: I334dfe94d70709434fd3c98c581a80cc4a7c00a4
Xin Li [Tue, 9 Jul 2019 23:00:55 +0000 (16:00 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am:
33080d8b49 -s ours
am:
2c1e06e589 -s ours
am skip reason: subject contains skip directive
Change-Id: If8cd430d5b10fbc50fc0cde9314644ec34b2309b
Xin Li [Tue, 9 Jul 2019 22:18:16 +0000 (15:18 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
am:
33080d8b49 -s ours
am skip reason: subject contains skip directive
Change-Id: Id76bbc6615fa330e65f857c365e96c446855a242
Xin Li [Tue, 9 Jul 2019 21:38:47 +0000 (21:38 +0000)]
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"
Xin Li [Tue, 9 Jul 2019 18:24:40 +0000 (11:24 -0700)]
DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
Bug:
136196576
Change-Id: I2fc2c9bb2631e627ebe74b6f081819c1eb0f3fcd
android-build-team Robot [Mon, 8 Jul 2019 23:36:54 +0000 (23:36 +0000)]
Snap for
5622519 from
59295fbb94e3a75c3341419aadbc66c560296179 to pi-platform-release
Change-Id: I402d144258df8eefe4c87766616ba32221bfbb67
Xin Li [Tue, 2 Jul 2019 23:35:26 +0000 (16:35 -0700)]
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (
5699924) into stage-aosp-master am:
aaea4b51ed
am:
e39e69254e -s ours
am skip reason: subject contains skip directive
Change-Id: I70cd10460af03a9c7ea89fed0edb422a24c99a3f
Xin Li [Tue, 2 Jul 2019 20:47:31 +0000 (13:47 -0700)]
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (
5699924) into stage-aosp-master
am:
aaea4b51ed
Change-Id: Id23cf76973224c771883eb1abb38191fc52d679b
Xin Li [Mon, 1 Jul 2019 21:00:30 +0000 (21:00 +0000)]
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (
5699924) into stage-aosp-master
Bug:
134405016
Change-Id: I19ac2279aa2cb1c5ad444d25484aa1ec0d7efac6
Paul Lawrence [Sat, 29 Jun 2019 01:15:53 +0000 (18:15 -0700)]
[automerger skipped] Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev am:
dde9704664 am:
7d43cb0ae9 -s ours
am:
39a0ecec18 -s ours
am skip reason: change_id I8365a40298b752af4bb10d00d9ff58ce04beab1f with SHA1
236e5e800e is in history
Change-Id: I2596b55b73e6eb969fa9b8c596acf0329c36ac52
Paul Lawrence [Fri, 28 Jun 2019 22:07:54 +0000 (15:07 -0700)]
[automerger skipped] Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev am:
dde9704664
am:
7d43cb0ae9 -s ours
am skip reason: change_id I8365a40298b752af4bb10d00d9ff58ce04beab1f with SHA1
236e5e800e is in history
Change-Id: I2b29a01279fcd03f35a17156d5eafc42ce510980
Paul Lawrence [Fri, 28 Jun 2019 00:39:42 +0000 (17:39 -0700)]
[automerger skipped] Merge "Add property to prevent commit for Vts test" am:
5bcfb5bf45 am:
3507d68556 -s ours am:
d5fe5cfcb5 -s ours
am:
d233d202ba -s ours
am skip reason: change_id I20441964dbc7b6ad5b445fa17a1374c1282bbbd8 with SHA1
3f1ce062d5 is in history
Change-Id: I54fdd0db5490c80810aac4dca04b42d18b9b44ee
Paul Lawrence [Fri, 28 Jun 2019 00:06:54 +0000 (17:06 -0700)]
[automerger skipped] Merge "Add property to prevent commit for Vts test" am:
5bcfb5bf45 am:
3507d68556 -s ours
am:
d5fe5cfcb5 -s ours
am skip reason: change_id I20441964dbc7b6ad5b445fa17a1374c1282bbbd8 with SHA1
3f1ce062d5 is in history
Change-Id: Iab7f9bf4e3d7968384b2a35ae398e60e84bf0664
Paul Lawrence [Thu, 27 Jun 2019 23:47:16 +0000 (16:47 -0700)]
[automerger skipped] Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev am:
dde9704664 -s ours am:
13539f79f5 -s ours
am:
125e79e344 -s ours
am skip reason: change_id I8365a40298b752af4bb10d00d9ff58ce04beab1f with SHA1
236e5e800e is in history
Change-Id: I27f743c943364f372261d7a6aa93d9dfbf2ae634
Paul Lawrence [Thu, 27 Jun 2019 23:46:06 +0000 (16:46 -0700)]
[automerger skipped] Merge "Add property to prevent commit for Vts test" am:
5bcfb5bf45
am:
3507d68556 -s ours
am skip reason: change_id I20441964dbc7b6ad5b445fa17a1374c1282bbbd8 with SHA1
3f1ce062d5 is in history
Change-Id: I2a5fe3fc7bbf3af55facde1ab07bd0559d8e7d87
Paul Lawrence [Thu, 27 Jun 2019 23:38:26 +0000 (16:38 -0700)]
[automerger skipped] Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev am:
dde9704664 -s ours
am:
13539f79f5 -s ours
am skip reason: change_id I8365a40298b752af4bb10d00d9ff58ce04beab1f with SHA1
236e5e800e is in history
Change-Id: I0ed87e8107d4007c42545397d2cb03628527671a
Paul Lawrence [Thu, 27 Jun 2019 23:26:57 +0000 (16:26 -0700)]
Merge "Add property to prevent commit for Vts test"
am:
5bcfb5bf45
Change-Id: Ic6b0e863fb9c6ddea2cb19390a9520c3c87cf704
Paul Lawrence [Thu, 27 Jun 2019 23:25:58 +0000 (16:25 -0700)]
[automerger skipped] Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev
am:
dde9704664 -s ours
am skip reason: change_id I8365a40298b752af4bb10d00d9ff58ce04beab1f with SHA1
236e5e800e is in history
Change-Id: I11c77206000895c27aee9ad8326778ec95e233df
Paul Lawrence [Thu, 27 Jun 2019 23:25:15 +0000 (16:25 -0700)]
Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev
am:
dde9704664
Change-Id: I091c8d095b29dc966da86c2d4c93281615043355
Treehugger Robot [Thu, 27 Jun 2019 22:39:57 +0000 (22:39 +0000)]
Merge "Add property to prevent commit for Vts test"
TreeHugger Robot [Thu, 27 Jun 2019 22:36:27 +0000 (22:36 +0000)]
Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev
David Anderson [Thu, 27 Jun 2019 20:40:09 +0000 (13:40 -0700)]
libdm now requires linking to libext2_uuid.
Bug:
135771280
Test: mm vold -j
Change-Id: Id71c71926841581d4d3bc4a66f4c06294df21028
Paul Lawrence [Thu, 27 Jun 2019 20:19:47 +0000 (13:19 -0700)]
Merge "Make ext4 userdata checkpoints work with metadata encryption" am:
2c792e0720 am:
5f19ef31c8 am:
4ad86a9315
am:
4f4c7263ea
Change-Id: I621ceb7061c43c5023f6aae46e768ba4527b65cd
Tri Vo [Thu, 27 Jun 2019 18:48:51 +0000 (11:48 -0700)]
Merge "vold: use RAII wake locks" am:
b585363d93 am:
99fd2a4b5a am:
a4a04f5717
am:
b8e6df416e
Change-Id: I28927b75a4807400de5b242e700fef68a1270ec9
Xin Li [Thu, 27 Jun 2019 18:47:13 +0000 (11:47 -0700)]
Merge "[automerger skipped] Restore historical behavior with fsck_msdos (always accept fixes). am:
3601f4790b am:
cd5df6e1ef -s ours
am:
e7cd361716 -s ours
am skip reason: change_id I1d50a7e52fda34e59eb6f051c7fde115a6cd5255 with SHA1
3601f4790b is in history
Change-Id: I332dde546a06f991b549794d5ec322dd796a95a2
Xin Li [Thu, 27 Jun 2019 18:39:45 +0000 (11:39 -0700)]
[automerger skipped] Restore historical behavior with fsck_msdos (always accept fixes). am:
3601f4790b -s ours am:
0092301976 -s ours
am:
adeb6833b2 -s ours
am skip reason: change_id I1d50a7e52fda34e59eb6f051c7fde115a6cd5255 with SHA1
3d3a9a7f1c is in history
Change-Id: I79ea3adee533e756083de42c6da72f5be0b74ac3
Paul Lawrence [Thu, 27 Jun 2019 18:13:01 +0000 (11:13 -0700)]
Merge "Make ext4 userdata checkpoints work with metadata encryption" am:
2c792e0720 am:
5f19ef31c8
am:
4ad86a9315
Change-Id: I84b4618240530e4368a6275b84a456da9b518057
Paul Lawrence [Thu, 27 Jun 2019 18:03:03 +0000 (11:03 -0700)]
Merge "Make ext4 userdata checkpoints work with metadata encryption" am:
2c792e0720
am:
5f19ef31c8
Change-Id: I7da7077c70484cb5873b9316058bc73158c19ab6
Paul Lawrence [Thu, 27 Jun 2019 17:50:06 +0000 (10:50 -0700)]
Merge "Make ext4 userdata checkpoints work with metadata encryption"
am:
2c792e0720
Change-Id: I1aed54ccf98fb73b29ed13fa971bbfbb25a489ae
Paul Lawrence [Tue, 25 Jun 2019 21:44:33 +0000 (14:44 -0700)]
Make ext4 userdata checkpoints work with metadata encryption
When both ext4 user data checkpoints and metadata encryption are
enabled, we are creating two stacked dm devices. This had not been
properly thought through or debugged.
Test: Enable metadata encryption on taimen (add
keydirectory=/metadata/vold/metadata_encryption to flags for userdata in
fstab.hardware)
Unfortunately metadata is not wiped by fastboot -w, so it is
necessary to rm metadata/vold -rf whenever you wipe data.
fastboot flashall -w works
fastboot reboot -w works
A normal boot works
Disable checkpoint commits with
setprop persist.vold.dont_commit_checkpoint 1
vdc checkpoint startCheckpoint 10
adb reboot
wait for device to fully boot then
adb reboot
Wait for device to fully boot then
adb logcat -d | grep Checkpoint shows the rollback in the logs
This tests encryption on top of checkpoints with commit, encryption
without checkpoints, and rollback, which seems to be the key cases.
Also ran same tests on unmodified Taimen and Blueline
Bug:
135905679
Merged-In: I8365a40298b752af4bb10d00d9ff58ce04beab1f
Change-Id: I8365a40298b752af4bb10d00d9ff58ce04beab1f
Treehugger Robot [Thu, 27 Jun 2019 17:29:03 +0000 (17:29 +0000)]
Merge "Make ext4 userdata checkpoints work with metadata encryption"
Tri Vo [Thu, 27 Jun 2019 16:12:35 +0000 (09:12 -0700)]
Merge "vold: use RAII wake locks" am:
b585363d93 am:
99fd2a4b5a
am:
a4a04f5717
Change-Id: Ifc5e42eaebc4e07688180e008612c5b2de3d7caf
Tri Vo [Thu, 27 Jun 2019 02:43:21 +0000 (19:43 -0700)]
Merge "vold: use RAII wake locks" am:
b585363d93
am:
99fd2a4b5a
Change-Id: I8e37d315ecb6bad994d2a9c748cfc835756e265e
Tri Vo [Thu, 27 Jun 2019 02:30:09 +0000 (19:30 -0700)]
Merge "vold: use RAII wake locks"
am:
b585363d93
Change-Id: I21be9e28c19901c9ca3aa91eb2f7394d1f788ff2
Tri Vo [Thu, 27 Jun 2019 01:59:08 +0000 (01:59 +0000)]
Merge "vold: use RAII wake locks"
Android Build Merger (Role) [Wed, 26 Jun 2019 22:23:00 +0000 (22:23 +0000)]
Merge "[automerger skipped] Restore historical behavior with fsck_msdos (always accept fixes). am:
3601f4790b am:
cd5df6e1ef -s ours am skip reason: change_id I1d50a7e52fda34e59eb6f051c7fde115a6cd5255 with SHA1
3d3a9a7f1c is in history" into qt-r1-dev-plus-aosp
Xin Li [Wed, 26 Jun 2019 22:22:32 +0000 (15:22 -0700)]
[automerger skipped] Restore historical behavior with fsck_msdos (always accept fixes). am:
3601f4790b
am:
cd5df6e1ef -s ours
am skip reason: change_id I1d50a7e52fda34e59eb6f051c7fde115a6cd5255 with SHA1
3d3a9a7f1c is in history
Change-Id: I8c1479273fc202237237f57a3ed2e79401083dd5
Xin Li [Wed, 26 Jun 2019 22:22:31 +0000 (15:22 -0700)]
[automerger skipped] Restore historical behavior with fsck_msdos (always accept fixes). am:
3601f4790b -s ours
am:
0092301976 -s ours
am skip reason: change_id I1d50a7e52fda34e59eb6f051c7fde115a6cd5255 with SHA1
3d3a9a7f1c is in history
Change-Id: Ife2798dfa4052da6c8fe8512f5899efd3a11cfe8
Paul Lawrence [Tue, 25 Jun 2019 21:44:33 +0000 (14:44 -0700)]
Make ext4 userdata checkpoints work with metadata encryption
When both ext4 user data checkpoints and metadata encryption are
enabled, we are creating two stacked dm devices. This had not been
properly thought through or debugged.
Test: Enable metadata encryption on taimen (add
keydirectory=/metadata/vold/metadata_encryption to flags for userdata in
fstab.hardware)
Unfortunately metadata is not wiped by fastboot -w, so it is
necessary to rm metadata/vold -rf whenever you wipe data.
fastboot flashall -w works
fastboot reboot -w works
A normal boot works
Disable checkpoint commits with
setprop persist.vold.dont_commit_checkpoint 1
vdc checkpoint startCheckpoint 10
adb reboot
wait for device to fully boot then
adb reboot
Wait for device to fully boot then
adb logcat -d | grep Checkpoint shows the rollback in the logs
This tests encryption on top of checkpoints with commit, encryption
without checkpoints, and rollback, which seems to be the key cases.
Bug:
135905679
Change-Id: I8365a40298b752af4bb10d00d9ff58ce04beab1f
Xin Li [Wed, 26 Jun 2019 22:09:02 +0000 (15:09 -0700)]
[automerger skipped] Restore historical behavior with fsck_msdos (always accept fixes).
am:
3601f4790b -s ours
am skip reason: change_id I1d50a7e52fda34e59eb6f051c7fde115a6cd5255 with SHA1
3d3a9a7f1c is in history
Change-Id: Ib97568c9eaecb3c52e4703f7d14a8235b9cc0cc4
Xin Li [Wed, 26 Jun 2019 22:08:51 +0000 (15:08 -0700)]
Restore historical behavior with fsck_msdos (always accept fixes).
am:
3601f4790b
Change-Id: I0c362a06814657e2ecf1059a942b7c21cf4e3051
Tri Vo [Fri, 21 Jun 2019 19:21:48 +0000 (12:21 -0700)]
vold: use RAII wake locks
Prevents wake lock leaks, e.g. b/
133175847
Bug:
133175847
Test: boot blueline
Change-Id: Icda4c81e00a61adec6a12c61c329867fef284dc5
Xin Li [Thu, 6 Jun 2019 18:33:51 +0000 (11:33 -0700)]
Restore historical behavior with fsck_msdos (always accept fixes).
Bug:
133725065
Merged-In: I1d50a7e52fda34e59eb6f051c7fde115a6cd5255
Change-Id: I1d50a7e52fda34e59eb6f051c7fde115a6cd5255
Ruslan Tkhakokhov [Fri, 21 Jun 2019 17:10:23 +0000 (10:10 -0700)]
Merge "Merged-In Revert "vold: use RAII wake locks"" am:
2ebb5c5b96 am:
fce081efa6 am:
0e2317857b
am:
9bb470b33b
Change-Id: I692ea272b29058195e848a53c46fb2f6185fc9bc
Ruslan Tkhakokhov [Fri, 21 Jun 2019 16:10:53 +0000 (09:10 -0700)]
Merge "Merged-In Revert "vold: use RAII wake locks"" am:
2ebb5c5b96 am:
fce081efa6
am:
0e2317857b
Change-Id: I1fa6054701877f2e6b81bd22292311234f47bc64
Ruslan Tkhakokhov [Fri, 21 Jun 2019 15:27:57 +0000 (08:27 -0700)]
Merge "Merged-In Revert "vold: use RAII wake locks"" am:
2ebb5c5b96
am:
fce081efa6
Change-Id: If58a55eecb04453f69e51cdc242f5ab71fb7ddc1
Ruslan Tkhakokhov [Fri, 21 Jun 2019 15:08:21 +0000 (08:08 -0700)]
Merge "Merged-In Revert "vold: use RAII wake locks""
am:
2ebb5c5b96
Change-Id: I6fe423a47de01eaf3d5bcc27fbfd7d96ea184156
Ruslan Tkhakokhov [Fri, 21 Jun 2019 10:31:11 +0000 (10:31 +0000)]
Merged-In Revert "vold: use RAII wake locks"
This reverts commit
242130f3f8180baef35649f350ca737d0b0c6ae3.
Reason for revert: breaks the build
Change-Id: Ide809a114b2a04538f3ba4ed8af934bf326e54f3
Ruslan Tkhakokhov [Fri, 21 Jun 2019 10:34:43 +0000 (10:34 +0000)]
Merge "Merged-In Revert "vold: use RAII wake locks""
Ruslan Tkhakokhov [Fri, 21 Jun 2019 10:31:11 +0000 (10:31 +0000)]
Merged-In Revert "vold: use RAII wake locks"
This reverts commit
242130f3f8180baef35649f350ca737d0b0c6ae3.
Reason for revert: breaks the build
Change-Id: Ide809a114b2a04538f3ba4ed8af934bf326e54f3
David Anderson [Fri, 21 Jun 2019 01:43:00 +0000 (18:43 -0700)]
Merge "Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously." am:
ee5eb39169 am:
5973b8cf00 am:
4d0dadb629
am:
b8150885e3
Change-Id: I9d5b0b46d11ba4b75073812b9ff71b061a694d34
David Anderson [Fri, 21 Jun 2019 01:28:20 +0000 (18:28 -0700)]
Merge "Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously." am:
ee5eb39169 am:
5973b8cf00
am:
4d0dadb629
Change-Id: I63edc074953f99005f7e7b6fb53357fe7e9a085f
David Anderson [Fri, 21 Jun 2019 01:16:56 +0000 (18:16 -0700)]
Merge "Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously." am:
ee5eb39169
am:
5973b8cf00
Change-Id: Ieb48b5b3ca4e5576d22b7db9bcc229b8fb2f47fb
David Anderson [Fri, 21 Jun 2019 01:06:16 +0000 (18:06 -0700)]
Merge "Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously."
am:
ee5eb39169
Change-Id: Ib82969daab218360712f1b3bf2c2069c95932ee2
Tri Vo [Fri, 21 Jun 2019 00:47:02 +0000 (17:47 -0700)]
Merge "vold: use RAII wake locks" am:
798aa303da am:
56c6681ba8 am:
c3d9197784
am:
1a3b759a95
Change-Id: Ibb6db27d179e6dc64adc0add7ad163d2a30ec979
David Anderson [Thu, 20 Jun 2019 23:59:47 +0000 (23:59 +0000)]
Merge "Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously."
Tri Vo [Thu, 20 Jun 2019 23:35:52 +0000 (16:35 -0700)]
Merge "vold: use RAII wake locks" am:
798aa303da am:
56c6681ba8
am:
c3d9197784
Change-Id: I72c71a287162811acb24b9bc8be381b88b818488
Tri Vo [Thu, 20 Jun 2019 22:57:53 +0000 (15:57 -0700)]
Merge "vold: use RAII wake locks" am:
798aa303da
am:
56c6681ba8
Change-Id: I3f87e1ad31701c24fdc426c3bd562a47871e3631
Tri Vo [Thu, 20 Jun 2019 22:25:46 +0000 (15:25 -0700)]
Merge "vold: use RAII wake locks"
am:
798aa303da
Change-Id: I157e8ceb8ece246d00ce345bd110023977a6d208
Tri Vo [Thu, 20 Jun 2019 19:42:50 +0000 (19:42 +0000)]
Merge "vold: use RAII wake locks"
Tri Vo [Tue, 18 Jun 2019 22:33:01 +0000 (15:33 -0700)]
vold: use RAII wake locks
Prevents wake lock leaks, e.g. b/
133175847
Bug:
133175847
Test: boot blueline
Change-Id: I62fd1c6c3abbfd35aebe11343abd717a7cf4eef7
David Anderson [Tue, 11 Jun 2019 21:51:25 +0000 (14:51 -0700)]
Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously.
Bug:
134711825
Test: StorageManagerTest
Change-Id: Id8616804bba622226ca21b8eff0d3eb577b4b7e0
TreeHugger Robot [Sat, 15 Jun 2019 15:27:16 +0000 (15:27 +0000)]
Merge "Keymaster memory management is inconsistent"
Paul Lawrence [Sat, 15 Jun 2019 00:43:08 +0000 (17:43 -0700)]
Merge "Fail startCheckpoint if checkpoints not supported" am:
6c704f736c am:
7c35004b27 am:
1fc2d57bbd
am:
f0eddd18ac
Change-Id: Iea6fa5051cf9e16ee68dda9bf0900772d5e672fa
Paul Lawrence [Sat, 15 Jun 2019 00:33:30 +0000 (17:33 -0700)]
Merge "Fail startCheckpoint if checkpoints not supported" am:
6c704f736c am:
7c35004b27
am:
1fc2d57bbd
Change-Id: I3ab32e4f3290e52f1ad27054a957b0632567f4bd
Paul Lawrence [Sat, 15 Jun 2019 00:20:04 +0000 (17:20 -0700)]
Merge "Fail startCheckpoint if checkpoints not supported" am:
6c704f736c
am:
7c35004b27
Change-Id: Ie1906ef96432bed1058cc8ce6ecb6cd58adc769c
Paul Lawrence [Sat, 15 Jun 2019 00:11:00 +0000 (17:11 -0700)]
Merge "Fail startCheckpoint if checkpoints not supported"
am:
6c704f736c
Change-Id: I631c9828782452ab763d108d85082cd2120c5ee7
Treehugger Robot [Fri, 14 Jun 2019 23:30:49 +0000 (23:30 +0000)]
Merge "Fail startCheckpoint if checkpoints not supported"
Paul Lawrence [Wed, 12 Jun 2019 19:03:01 +0000 (12:03 -0700)]
Add property to prevent commit for Vts test
Old approach (do not start class main) does not work because when
testings userdebug GSI on user system, adb does not start until the
framework starts.
Bug:
134126407
Test: Test passes with userdebug GSI on user Taimen
Merged-in: I20441964dbc7b6ad5b445fa17a1374c1282bbbd8
Change-Id: I20441964dbc7b6ad5b445fa17a1374c1282bbbd8
Paul Lawrence [Thu, 13 Jun 2019 20:42:50 +0000 (13:42 -0700)]
Add property to prevent commit for Vts test am:
3f1ce062d5 am:
6eb8fa296e
am:
dc76794d57
Change-Id: I8ce5383c98bd7a2f2bfc9dfc1083e059caa61dd8
Paul Lawrence [Thu, 13 Jun 2019 20:28:48 +0000 (13:28 -0700)]
Add property to prevent commit for Vts test am:
3f1ce062d5
am:
6eb8fa296e
Change-Id: I2027a793555fe4eceafc0ff03a05ff99d9ddf497
Paul Lawrence [Thu, 13 Jun 2019 20:27:04 +0000 (13:27 -0700)]
Add property to prevent commit for Vts test am:
3f1ce062d5 am:
1289741942
am:
ff067f8f45
Change-Id: I42a236d1697b22de4aa5eee55aa68308608fb029
Paul Lawrence [Thu, 13 Jun 2019 20:21:05 +0000 (13:21 -0700)]
Add property to prevent commit for Vts test am:
3f1ce062d5
am:
1289741942
Change-Id: Ib0420dfa4a810e4a55a7370e146df67cef735fa9
Paul Lawrence [Thu, 13 Jun 2019 20:18:10 +0000 (13:18 -0700)]
Add property to prevent commit for Vts test
am:
3f1ce062d5
Change-Id: Ia742cb1ff865f5fd7b13843e72ee5309d90560db
Paul Lawrence [Thu, 13 Jun 2019 20:13:20 +0000 (13:13 -0700)]
Add property to prevent commit for Vts test
am:
3f1ce062d5
Change-Id: I96f61fbd0dda813bb55784074b7b949437cabff8
Paul Lawrence [Wed, 12 Jun 2019 19:03:01 +0000 (12:03 -0700)]
Add property to prevent commit for Vts test
Old approach (do not start class main) does not work because when
testings userdebug GSI on user system, adb does not start until the
framework starts.
Bug:
134126407
Test: Test passes with userdebug GSI on user Taimen
Change-Id: I20441964dbc7b6ad5b445fa17a1374c1282bbbd8
Janis Danisevskis [Wed, 12 Jun 2019 20:27:20 +0000 (13:27 -0700)]
Keymaster memory management is inconsistent
Objects derived from RefBase should always be owned by sp rather then
unique_ptr or other smart pointer implementations.
Bug:
79474587
Change-Id: I6a3ca04b3a3bab74c6114643ffdaeac537188d12
Xin Li [Mon, 10 Jun 2019 21:24:33 +0000 (14:24 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master" am:
170b45c75f -s ours am:
b74ed73043 -s ours am:
5abd86c21e
am:
108097c434 -s ours
am skip reason: subject contains skip directive
Change-Id: I91a2e391d73c5aec5e5759e0101e6164148b44fc
Xin Li [Mon, 10 Jun 2019 21:11:58 +0000 (14:11 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master" am:
170b45c75f -s ours am:
b74ed73043 -s ours
am:
5abd86c21e
Change-Id: I1fd6ee79d2b28e2132eaeece267dcebf464212db
The Android Open Source Project [Mon, 10 Jun 2019 20:43:55 +0000 (13:43 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master am:
1aebde23aa -s ours am:
d81505cac0 -s ours am:
4a243aa78c
am:
dfc2bb7ac1 -s ours
am skip reason: subject contains skip directive
Change-Id: I457b37b918e2ef1f871561e17634c6e5e8844d63
The Android Open Source Project [Mon, 10 Jun 2019 20:30:11 +0000 (13:30 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master am:
1aebde23aa -s ours am:
d81505cac0 -s ours
am:
4a243aa78c
Change-Id: I0ae696a0010818372484d3600712b96c654fac35
Xin Li [Mon, 10 Jun 2019 20:28:35 +0000 (13:28 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master" am:
170b45c75f -s ours
am:
b74ed73043 -s ours
am skip reason: subject contains skip directive
Change-Id: I5b825a62b888b1d3a654da7ebc3c5cacb56f226d
Xin Li [Mon, 10 Jun 2019 20:21:45 +0000 (13:21 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master"
am:
170b45c75f -s ours
am skip reason: subject contains skip directive
Change-Id: Iab16bbdc743962c766e7d556b7eeef4098f8a4ba
The Android Open Source Project [Mon, 10 Jun 2019 20:17:51 +0000 (13:17 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master am:
1aebde23aa -s ours
am:
d81505cac0 -s ours
am skip reason: subject contains skip directive
Change-Id: I5487c6e6a413585c86d346f0c8bf434bd29b4ecd
The Android Open Source Project [Mon, 10 Jun 2019 20:06:15 +0000 (13:06 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master
am:
1aebde23aa -s ours
am skip reason: subject contains skip directive
Change-Id: Ib9778c146fb82c715408db89cdaf45339f23ef05
Xin Li [Mon, 10 Jun 2019 19:54:58 +0000 (19:54 +0000)]
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master"