Commit graph

3122 commits

Author SHA1 Message Date
Paul Lawrence
13539f79f5 [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
2019-06-27 16:25:58 -07:00
Paul Lawrence
7d43cb0ae9 Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev
am: dde9704664

Change-Id: I091c8d095b29dc966da86c2d4c93281615043355
2019-06-27 16:25:15 -07:00
Treehugger Robot
5bcfb5bf45 Merge "Add property to prevent commit for Vts test" 2019-06-27 22:39:57 +00:00
TreeHugger Robot
dde9704664 Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev 2019-06-27 22:36:27 +00:00
David Anderson
10de69d7bb libdm now requires linking to libext2_uuid.
Bug: 135771280
Test: mm vold -j
Change-Id: Id71c71926841581d4d3bc4a66f4c06294df21028
2019-06-27 13:41:03 -07:00
Paul Lawrence
4f4c7263ea Merge "Make ext4 userdata checkpoints work with metadata encryption" am: 2c792e0720 am: 5f19ef31c8
am: 4ad86a9315

Change-Id: I84b4618240530e4368a6275b84a456da9b518057
2019-06-27 11:13:01 -07:00
Paul Lawrence
4ad86a9315 Merge "Make ext4 userdata checkpoints work with metadata encryption" am: 2c792e0720
am: 5f19ef31c8

Change-Id: I7da7077c70484cb5873b9316058bc73158c19ab6
2019-06-27 11:03:03 -07:00
Paul Lawrence
5f19ef31c8 Merge "Make ext4 userdata checkpoints work with metadata encryption"
am: 2c792e0720

Change-Id: I1aed54ccf98fb73b29ed13fa971bbfbb25a489ae
2019-06-27 10:50:06 -07:00
Paul Lawrence
b5ebd7d9c7 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
2019-06-27 17:42:25 +00:00
Treehugger Robot
2c792e0720 Merge "Make ext4 userdata checkpoints work with metadata encryption" 2019-06-27 17:29:03 +00:00
Tri Vo
b8e6df416e Merge "vold: use RAII wake locks" am: b585363d93 am: 99fd2a4b5a
am: a4a04f5717

Change-Id: Ifc5e42eaebc4e07688180e008612c5b2de3d7caf
2019-06-27 09:12:35 -07:00
android-build-team Robot
db3270a460 Snap for 5691653 from cd5df6e1ef to qt-c2f2-release
Change-Id: Ia29b034ba05fb150d148ad8ab53b447ddd1cdacb
2019-06-27 03:08:27 +00:00
Tri Vo
a4a04f5717 Merge "vold: use RAII wake locks" am: b585363d93
am: 99fd2a4b5a

Change-Id: I8e37d315ecb6bad994d2a9c748cfc835756e265e
2019-06-26 19:43:21 -07:00
Tri Vo
99fd2a4b5a Merge "vold: use RAII wake locks"
am: b585363d93

Change-Id: I21be9e28c19901c9ca3aa91eb2f7394d1f788ff2
2019-06-26 19:30:09 -07:00
Tri Vo
b585363d93 Merge "vold: use RAII wake locks" 2019-06-27 01:59:08 +00:00
Android Build Merger (Role)
e7cd361716 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 2019-06-26 22:23:00 +00:00
Xin Li
201932c1b9 [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
2019-06-26 15:22:32 -07:00
Xin Li
adeb6833b2 [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
2019-06-26 15:22:31 -07:00
Paul Lawrence
236e5e800e 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
2019-06-26 15:19:24 -07:00
Xin Li
0092301976 [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
2019-06-26 15:09:02 -07:00
Xin Li
cd5df6e1ef Restore historical behavior with fsck_msdos (always accept fixes).
am: 3601f4790b

Change-Id: I0c362a06814657e2ecf1059a942b7c21cf4e3051
2019-06-26 15:08:51 -07:00
Tri Vo
15bbe22879 vold: use RAII wake locks
Prevents wake lock leaks, e.g. b/133175847

Bug: 133175847
Test: boot blueline
Change-Id: Icda4c81e00a61adec6a12c61c329867fef284dc5
2019-06-26 10:20:30 -07:00
Xin Li
3601f4790b Restore historical behavior with fsck_msdos (always accept fixes).
Bug: 133725065
Merged-In: I1d50a7e52fda34e59eb6f051c7fde115a6cd5255
Change-Id: I1d50a7e52fda34e59eb6f051c7fde115a6cd5255
2019-06-26 10:02:17 -07:00
Ruslan Tkhakokhov
9bb470b33b Merge "Merged-In Revert "vold: use RAII wake locks"" am: 2ebb5c5b96 am: fce081efa6
am: 0e2317857b

Change-Id: I1fa6054701877f2e6b81bd22292311234f47bc64
2019-06-21 09:10:53 -07:00
Ruslan Tkhakokhov
0e2317857b Merge "Merged-In Revert "vold: use RAII wake locks"" am: 2ebb5c5b96
am: fce081efa6

Change-Id: If58a55eecb04453f69e51cdc242f5ab71fb7ddc1
2019-06-21 08:27:57 -07:00
Ruslan Tkhakokhov
fce081efa6 Merge "Merged-In Revert "vold: use RAII wake locks""
am: 2ebb5c5b96

Change-Id: I6fe423a47de01eaf3d5bcc27fbfd7d96ea184156
2019-06-21 08:08:21 -07:00
Ruslan Tkhakokhov
2ebb5c5b96 Merge "Merged-In Revert "vold: use RAII wake locks"" 2019-06-21 10:34:43 +00:00
Ruslan Tkhakokhov
a37c01756f Merged-In Revert "vold: use RAII wake locks"
This reverts commit 242130f3f8.

Reason for revert: breaks the build

Change-Id: Ide809a114b2a04538f3ba4ed8af934bf326e54f3
2019-06-21 10:33:30 +00:00
David Anderson
b8150885e3 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
2019-06-20 18:28:20 -07:00
David Anderson
4d0dadb629 Merge "Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously." am: ee5eb39169
am: 5973b8cf00

Change-Id: Ieb48b5b3ca4e5576d22b7db9bcc229b8fb2f47fb
2019-06-20 18:16:56 -07:00
David Anderson
5973b8cf00 Merge "Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously."
am: ee5eb39169

Change-Id: Ib82969daab218360712f1b3bf2c2069c95932ee2
2019-06-20 18:06:16 -07:00
David Anderson
ee5eb39169 Merge "Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously." 2019-06-20 23:59:47 +00:00
Tri Vo
1a3b759a95 Merge "vold: use RAII wake locks" am: 798aa303da am: 56c6681ba8
am: c3d9197784

Change-Id: I72c71a287162811acb24b9bc8be381b88b818488
2019-06-20 16:35:52 -07:00
Tri Vo
c3d9197784 Merge "vold: use RAII wake locks" am: 798aa303da
am: 56c6681ba8

Change-Id: I3f87e1ad31701c24fdc426c3bd562a47871e3631
2019-06-20 15:57:53 -07:00
Tri Vo
56c6681ba8 Merge "vold: use RAII wake locks"
am: 798aa303da

Change-Id: I157e8ceb8ece246d00ce345bd110023977a6d208
2019-06-20 15:25:46 -07:00
Tri Vo
798aa303da Merge "vold: use RAII wake locks" 2019-06-20 19:42:50 +00:00
Tri Vo
242130f3f8 vold: use RAII wake locks
Prevents wake lock leaks, e.g. b/133175847

Bug: 133175847
Test: boot blueline
Change-Id: I62fd1c6c3abbfd35aebe11343abd717a7cf4eef7
2019-06-18 15:34:12 -07:00
David Anderson
1dd5c4f787 Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously.
Bug: 134711825
Test: StorageManagerTest
Change-Id: Id8616804bba622226ca21b8eff0d3eb577b4b7e0
2019-06-18 15:27:37 -07:00
android-build-team Robot
90fe65f6ce Snap for 5663715 from 1289741942 to qt-c2f2-release
Change-Id: Ic91ccef614f7b7afd9977139ab462328cef59332
2019-06-15 23:04:25 +00:00
Paul Lawrence
f0eddd18ac Merge "Fail startCheckpoint if checkpoints not supported" am: 6c704f736c am: 7c35004b27
am: 1fc2d57bbd

Change-Id: I3ab32e4f3290e52f1ad27054a957b0632567f4bd
2019-06-14 17:33:30 -07:00
Paul Lawrence
1fc2d57bbd Merge "Fail startCheckpoint if checkpoints not supported" am: 6c704f736c
am: 7c35004b27

Change-Id: Ie1906ef96432bed1058cc8ce6ecb6cd58adc769c
2019-06-14 17:20:04 -07:00
Paul Lawrence
7c35004b27 Merge "Fail startCheckpoint if checkpoints not supported"
am: 6c704f736c

Change-Id: I631c9828782452ab763d108d85082cd2120c5ee7
2019-06-14 17:11:00 -07:00
Treehugger Robot
6c704f736c Merge "Fail startCheckpoint if checkpoints not supported" 2019-06-14 23:30:49 +00:00
Paul Lawrence
a7972dc732 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
2019-06-13 16:07:11 -07:00
Paul Lawrence
dc76794d57 Add property to prevent commit for Vts test am: 3f1ce062d5
am: 6eb8fa296e

Change-Id: I2027a793555fe4eceafc0ff03a05ff99d9ddf497
2019-06-13 13:28:48 -07:00
Paul Lawrence
ff067f8f45 Add property to prevent commit for Vts test am: 3f1ce062d5
am: 1289741942

Change-Id: Ib0420dfa4a810e4a55a7370e146df67cef735fa9
2019-06-13 13:21:05 -07:00
Paul Lawrence
6eb8fa296e Add property to prevent commit for Vts test
am: 3f1ce062d5

Change-Id: Ia742cb1ff865f5fd7b13843e72ee5309d90560db
2019-06-13 13:18:10 -07:00
Paul Lawrence
1289741942 Add property to prevent commit for Vts test
am: 3f1ce062d5

Change-Id: I96f61fbd0dda813bb55784074b7b949437cabff8
2019-06-13 13:13:20 -07:00
Paul Lawrence
3f1ce062d5 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
2019-06-12 14:24:13 -07:00
Xin Li
108097c434 [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
2019-06-10 14:11:58 -07:00