Commit graph

2380 commits

Author SHA1 Message Date
Treehugger Robot
1e1893812c Merge "Use unique points for fstab" 2018-10-03 23:57:39 +00:00
Daniel Rosenberg
d399249855 Add checkpointing support for A/B updates
This adds implicit rollback support during A/B style updates.
If you explicitly start a checkpoint with -1, needsRollback will
trigger if the update fails, and should be used if any additional
cleanup is needed that is not covered by A/B itself.

Test: All Checkpoint tests pass
Bug: 111020314
Change-Id: I88b4a1098c6bac4dc1438a54c8a8f59577a6c17b
2018-10-03 15:39:25 -07:00
Paul Lawrence
2040089ab0 Use unique points for fstab
Test: Checkpoint test script runs and passes
Change-Id: I13005da22aef5fda3d1e0941949db02ff0ff0870
2018-10-03 14:19:31 -07:00
Paul Lawrence
61c3eaf068 Merge "Make checkpointing work on ext4"
am: ac244261c8

Change-Id: I78da54f117c9c2710d2d1fbe4ec7e902bf944d5d
2018-10-03 13:31:25 -07:00
Treehugger Robot
ac244261c8 Merge "Make checkpointing work on ext4" 2018-10-03 20:15:48 +00:00
Paul Lawrence
1abb2fe278 Make checkpointing work on ext4
Test: All tests pass
Change-Id: I2a6cdf1edfe752f4633e1931e75d18659653938c
2018-10-03 09:15:27 -07:00
Mark Salyzyn
74a6c69e57 Merge "Protect /mnt/scratch from stale umount on userdebug"
am: b39e6f2887

Change-Id: I2505bc0cf4fe31123c47bd10619830298c3a033a
2018-10-02 15:24:57 -07:00
Treehugger Robot
b39e6f2887 Merge "Protect /mnt/scratch from stale umount on userdebug" 2018-10-02 21:31:12 +00:00
Mark Salyzyn
c4405e9c17 Protect /mnt/scratch from stale umount on userdebug
On userdebug protect /mnt/scratch. On user builds ensure that
/mnt/scratch is considered a stale mount so it can not be used.
vold runs before ro.debuggable is set, so this must be a compile
time decision.

Minor technical debt cleanup associated with using android::base.

Test: compile
Bug: 109821005
Change-Id: I8efdbedfe850dd24daecf03a37aea61de47edc7d
Merged-In: I8efdbedfe850dd24daecf03a37aea61de47edc7d
2018-10-02 18:00:49 +00:00
Sudheer Shanka
96707825f2 Merge "Remove unmount_tree in VolumeManager."
am: 9931db7e59

Change-Id: Ib02f999eb66c5685752abf99c0c77ba49dd60d74
2018-09-28 17:33:19 -07:00
Sudheer Shanka
9931db7e59 Merge "Remove unmount_tree in VolumeManager." 2018-09-28 23:49:51 +00:00
Sudheer Shanka
99d304ac60 Remove unmount_tree in VolumeManager.
This is not needed anymore since everything else is updated
to use android::vold::UnmountTree.

Bug: 111890351
Test: manual
Change-Id: Idb574469763fa3438fbfc40d6da786d87ac63c38
2018-09-28 13:38:39 -07:00
Sudheer Shanka
f5b24f1015 Merge "Add unmountTree to utils."
am: a64572431e

Change-Id: Ifdbdc90e22b4a681dcf0766919807109cf78ffca
2018-09-27 13:14:30 -07:00
Sudheer Shanka
a64572431e Merge "Add unmountTree to utils." 2018-09-27 19:54:23 +00:00
Sudheer Shanka
89ddf99119 Add unmountTree to utils.
Bug: 111890351
Test: builds without any errors
Change-Id: I62a94c9e8d101756b686b402774f08a1d71cf875
2018-09-27 10:29:02 -07:00
Daniel Rosenberg
7e84915c17 Merge "Add support for checkpointing"
am: a3381ffc3f

Change-Id: I52e70b0f886281280bb050751060b975e103376d
2018-09-25 15:10:22 -07:00
Treehugger Robot
a3381ffc3f Merge "Add support for checkpointing" 2018-09-25 21:52:19 +00:00
Oleksiy Avramchenko
1fe4696cdd Merge changes from topic "exfat-update"
am: a2a227e382

Change-Id: I13daa826be04c72ab18175d3ceee6212b7304731
2018-09-24 12:01:36 -07:00
Treehugger Robot
a2a227e382 Merge changes from topic "exfat-update"
* changes:
  Use exFAT for SDXC cards
  Add GetBlockDevSize, GetBlockDevSectors helpers
2018-09-24 18:52:56 +00:00
Jeff Sharkey
92c182e4c7 Merge "Update vold to log only debug or higher level messages."
am: 9bd07d8760

Change-Id: Idd8482fc0287d51d962ead0dd4c1f8f8e514d9de
2018-09-24 10:25:07 -07:00
Jeff Sharkey
9bd07d8760 Merge "Update vold to log only debug or higher level messages." 2018-09-24 17:06:25 +00:00
Oleksiy Avramchenko
4cff06d45f Use exFAT for SDXC cards
When both VFAT and exFAT are supported VFAT will only be used to
format card. Use exFAT for cards larger than 32GB per SDXC standard.

Test: build, manual, mount exFAT volume
Bug: 80202067
Change-Id: If504f9685256a669c5801a69d69d5a214ad27455
2018-09-24 14:28:24 +02:00
Oleksiy Avramchenko
625dc787c6 Add GetBlockDevSize, GetBlockDevSectors helpers
Helpers to get a block device size in bytes or 512 byte sectors,
using BLKGETSIZE64 and returning value of uint64_t type.

This also removes get_blkdev_size().

Test: build, manual, mount exFAT volume
Bug: 80202067
Change-Id: Ib07e8ac6ef7ff49de0ed570d1fa202e8b558b80c
2018-09-24 14:25:24 +02:00
Daniel Rosenberg
65f99c9e8b Add support for checkpointing
Checkpointing uses a combination of files on the meta partition
and the checkpoint= fs_mgr flag. Checkpointed partitions will
revert to their starting state on reboot unless checkpoint commit
is called.

Test: Run vdc commands, check file on metadata
Merged-In: Icba16578608a6cbf922472e9d4ae5b8cf5f016c6
Change-Id: Icba16578608a6cbf922472e9d4ae5b8cf5f016c6
2018-09-21 21:54:11 +00:00
Sudheer Shanka
4b6ca4ea65 Update vold to log only debug or higher level messages.
This will allow adding lots of verbose logs which can be enabled
only during local testing/debugging. Update the existing verbose
level logs to debug level since we want those to be logged by
default.

Test: manual
Change-Id: Ib05e2b6efa71308458d49affb6ed81d3975b28ab
2018-09-21 11:16:51 -07:00
Yifan Hong
e0a7888435 Merge "health.filesystem HAL renamed to health.storage"
am: 15b9656ae9

Change-Id: Id587f968eea321254589a0d0f3cd5fc23be56739
2018-09-20 22:38:46 -07:00
Paul Crowley
50cd072d3b Merge "clang-format the rest of the files"
am: 1934619b8b

Change-Id: I6265495330a13f687628b2143b9f78eb25380104
2018-09-20 22:38:27 -07:00
Yifan Hong
15b9656ae9 Merge "health.filesystem HAL renamed to health.storage" 2018-09-20 17:26:53 +00:00
Treehugger Robot
1934619b8b Merge "clang-format the rest of the files" 2018-09-20 17:14:35 +00:00
Paul Crowley
8915d62847 clang-format the rest of the files
Apply clang-format to fix the remaining files not fixed by
change I23cde3f0bbcac13bef555d13514e922c79d5ad48

Test: Format-only changes; treehugger suffices.
Change-Id: I1bfd5c8d68d298596875d5edae26cdfe27c03489
Merged-In: I1bfd5c8d68d298596875d5edae26cdfe27c03489
2018-09-20 06:27:22 -07:00
Paul Crowley
957b9544dd Merge "clang-format many files."
am: a676df01e2

Change-Id: Iecaed7fd342df49d628c2bc68f1bf5439163d918
2018-09-19 17:13:35 -07:00
Paul Crowley
a676df01e2 Merge "clang-format many files." 2018-09-19 21:06:17 +00:00
Yifan Hong
91a68dfc98 health.filesystem HAL renamed to health.storage
Bug: 111655771
Test: compiles
Change-Id: Ibfcab4d116d735ba2f80a8b0ead314138a7ba23d
Merged-In: Ibfcab4d116d735ba2f80a8b0ead314138a7ba23d
2018-09-19 13:11:50 -07:00
Paul Crowley
61ab6986a6 Merge "vold: metadata encryption: ensure F2FS GC targets correct device."
am: 3adf30745a

Change-Id: I9df60bbc12d7c70c0bd0fbda1e8604051306a8ee
2018-09-19 09:09:18 -07:00
Paul Crowley
3adf30745a Merge "vold: metadata encryption: ensure F2FS GC targets correct device." 2018-09-19 15:59:24 +00:00
Paul Crowley
14c8c0765a clang-format many files.
Test: Format-only changes; treehugger suffices.
Change-Id: I23cde3f0bbcac13bef555d13514e922c79d5ad48
2018-09-18 15:41:22 -07:00
Jaegeuk Kim
1251ef0bcf vold: metadata encryption: ensure F2FS GC targets correct device.
This fixes F2FS GC failure in idle-maint.

Bug: 111953875
Change-Id: I1d10802121d5641cf9ba780fee249affd2cf6ffe
Merged-In: I1d10802121d5641cf9ba780fee249affd2cf6ffe
Test: Tested by hand
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2018-09-18 13:14:34 -07:00
Roman Kiryanov
95d26139a4 Merge "Do not crash if secontext is nullptr"
am: 6418bb7d34

Change-Id: Iad725cb3c6a40a0917106dee3b2b604b1cb921a5
2018-09-18 07:26:00 -07:00
Treehugger Robot
6418bb7d34 Merge "Do not crash if secontext is nullptr" 2018-09-18 14:15:13 +00:00
Roman Kiryanov
bda3032fcc Do not crash if secontext is nullptr
LOG(DEBUG) tries to print a string pointed by secontext.get() but
crashed if it was nullptr.

Bug: 111888637
Test: "make -j50" and ran emulator
Change-Id: Iac78f650e7f48781030dc610f7d35cd52c250802
Merged-In: Iac78f650e7f48781030dc610f7d35cd52c250802
Signed-off-by: Roman Kiryanov <rkir@google.com>
2018-09-17 16:15:33 -07:00
Yifan Hong
def8ce02b6 Merge "vold uses health filesystem HAL"
am: fa96af82f3

Change-Id: I232955955686a2767d290863278b49f4f99520c5
2018-09-17 15:50:29 -07:00
Treehugger Robot
fa96af82f3 Merge "vold uses health filesystem HAL" 2018-09-17 22:30:34 +00:00
Yifan Hong
024a1241a6 vold uses health filesystem HAL
to runDevGc(). This fixes a Treble violation.
Bug: 111655771
Test: manual

Change-Id: I53d6db6ffa99e43e281f8086442151692c1826ca
2018-09-17 10:06:57 -07:00
Jaegeuk Kim
d305bbc526 Merge "fix wrong ioctl direction for F2FS_IOC_GET_PIN_FILE"
am: 3a7f95af09

Change-Id: I74d6b44bb7de16b57e9ed0b42cec70e7633b28e1
2018-09-13 12:49:30 -07:00
Treehugger Robot
3a7f95af09 Merge "fix wrong ioctl direction for F2FS_IOC_GET_PIN_FILE" 2018-09-13 19:03:41 +00:00
Jaegeuk Kim
1dcfbe2a01 fix wrong ioctl direction for F2FS_IOC_GET_PIN_FILE
Change-Id: I0cf212c3e1770e233ae1f70e7fc4a6d70b82583e
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2018-09-12 10:10:51 -07:00
Jeff Sharkey
d7b918f9f3 Merge "vold should be fully developed in AOSP."
am: de85ef5c37

Change-Id: I41da6719f6d9fc4a358bb8a0d99358360d779182
2018-09-11 14:00:11 -07:00
Treehugger Robot
de85ef5c37 Merge "vold should be fully developed in AOSP." 2018-09-11 20:50:05 +00:00
Jeff Sharkey
8ecdb493d9 vold should be fully developed in AOSP.
Bug: 113136846
Test: manual
Change-Id: Ifdd54260153d47e47aca5f422bffcc828d45dc28
2018-09-11 12:08:43 -06:00
android-build-team Robot
31cfdaaa08 Merge cherrypicks of [4793640, 4793602, 4793603, 4793660, 4793604, 4793680, 4793681, 4793581, 4793582, 4793625, 4793626, 4793627, 4793628, 4793700, 4793701, 4793702, 4793703, 4793704, 4793705, 4793661, 4793720, 4793721, 4793722, 4793723, 4793724, 4793725, 4793726, 4793727, 4793728, 4793583, 4793740, 4793760, 4793662, 4793780, 4793729] into pi-release-2
Change-Id: I665794d270556b24de04163aad6fd27dc2fcc4a5
2018-08-16 16:41:06 +00:00