Commit graph

2411 commits

Author SHA1 Message Date
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
Greg Kaiser
e7d3304fee cryptfs: Remove Speck support
Remove the Speck encryption support. It was eventually
decided not to allow Speck in Android P, so this code
is no longer needed and wasn't used outside of testing.

Note we don't just "git revert" the original commit
(38723f23ff) because we want
to retain the infrastructure for allowing new types of
crypto algorithms in the future.

Bug: 112009351
Test: Attempted to setup a device with ro.crypto.fde_algorithm set to Speck, and Speck was rejected and the system defaulted to AES.
Change-Id: I69a8b4e8632f8d30b5b54783cb986ab42d4397d9
(cherry picked from commit 17059fe53b)
2018-08-16 16:40:49 +00:00
Jaegeuk Kim
66166118d2 Merge "vold: Grant root group"
am: 732def209c

Change-Id: If13da04a9cff5a54665626397b9c6bc165df10c7
2018-08-13 14:06:05 -07:00
Treehugger Robot
732def209c Merge "vold: Grant root group" 2018-08-13 20:54:13 +00:00
Jaegeuk Kim
c0eea5736e vold: Grant root group
When using make_f2fs to format a filesystem with quota enabled, make_f2fs
will write quota record with group id equtal to make_f2fs's execution
group id.
Vold shall run as root group so that make_f2fs forked by vold will enherit
vold's root group. Make_f2fs can then write quota record with group id for
root group and therefore kernel quota driver can find quota record for
root group.

Bug: 111775499
Change-Id: I0c1fef760597d1695586d24365200b25e2cf07e6
Signed-off-by: Light Hsieh <light.hsieh@mediatek.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2018-08-08 17:08:02 -07:00
Paul Crowley
a2c5a6b3c2 Merge "Switch pattern/PIN constants to match values in cryptfs.h" am: 92f5db4a06
am: 6d418929f0

Change-Id: I68dc3538393c51c2055535eb55587ebb7b697ba7
2018-08-08 11:33:12 -07:00
Greg Kaiser
1bc4f99b35 Merge "cryptfs: Remove Speck support" am: cf0cb0bc1f
am: 421e1059b7

Change-Id: I26fe4bc95f91f410cf1242e698e94ed4231c01ee
2018-08-08 11:05:38 -07:00
Paul Crowley
6d418929f0 Merge "Switch pattern/PIN constants to match values in cryptfs.h"
am: 92f5db4a06

Change-Id: I6eb0b99b9fbd25ed8f189cbc914a9a3bd7cb3069
2018-08-08 11:01:30 -07:00
Greg Kaiser
421e1059b7 Merge "cryptfs: Remove Speck support"
am: cf0cb0bc1f

Change-Id: I4e44dd132d94b7583ab2df50469ac80bf9ae7a9b
2018-08-08 10:41:09 -07:00
android-build-team Robot
ecc2701851 Snap for 4939496 from 17059fe53b to pi-qpr1-release
Change-Id: Id8422a6cb43aa012ff53dd70a684b3b3c859ec51
2018-08-08 03:15:27 +00:00
Xin Li
ae4709298d Merge "Merge Android Pie into master" am: 7fcaa13d4c
am: 2042258f38

Change-Id: If376d606aa23dbb916bc8255da9febc5f095ca5a
2018-08-07 19:20:42 -07:00
Xin Li
2042258f38 Merge "Merge Android Pie into master"
am: 7fcaa13d4c

Change-Id: I99ee2ff5662766207659cfa1afc9f337f238c781
2018-08-07 15:51:17 -07:00
Treehugger Robot
92f5db4a06 Merge "Switch pattern/PIN constants to match values in cryptfs.h" 2018-08-07 22:03:11 +00:00
Treehugger Robot
cf0cb0bc1f Merge "cryptfs: Remove Speck support" 2018-08-07 21:11:50 +00:00
Greg Kaiser
17059fe53b cryptfs: Remove Speck support
Remove the Speck encryption support. It was eventually
decided not to allow Speck in Android P, so this code
is no longer needed and wasn't used outside of testing.

Note we don't just "git revert" the original commit
(38723f23ff) because we want
to retain the infrastructure for allowing new types of
crypto algorithms in the future.

Bug: 112009351
Test: Attempted to setup a device with ro.crypto.fde_algorithm set to Speck, and Speck was rejected and the system defaulted to AES.
Change-Id: I69a8b4e8632f8d30b5b54783cb986ab42d4397d9
2018-08-07 10:19:23 -07:00
Paul Crowley
ca08c0a724 Switch pattern/PIN constants to match values in cryptfs.h
Bug: 111051602
Test: Steps to reproduce in b/111051602
Change-Id: I21955f41d2594917d5baa1bc4d61da0106cd9170
2018-08-07 10:19:05 -07:00
Greg Kaiser
b353a61292 cryptfs: Remove Speck support
Remove the Speck encryption support. It was eventually
decided not to allow Speck in Android P, so this code
is no longer needed and wasn't used outside of testing.

Note we don't just "git revert" the original commit
(38723f23ff) because we want
to retain the infrastructure for allowing new types of
crypto algorithms in the future.

Bug: 112009351
Test: Attempted to setup a device with ro.crypto.fde_algorithm set to Speck, and Speck was rejected and the system defaulted to AES.
Change-Id: I69a8b4e8632f8d30b5b54783cb986ab42d4397d9
2018-08-07 10:11:05 -07:00
Xin Li
7fcaa13d4c Merge "Merge Android Pie into master" 2018-08-07 16:51:28 +00:00
Xin Li
25f0830ff1 Merge Android Pie into master
Bug: 112104996
Change-Id: Ibda46522d646c0a391c7d19663e4ffdb3d4b30fc
2018-08-06 16:52:51 -07:00
Jaegeuk Kim
2db64225ca Merge "secdiscard: should pin_file to avoid moving blocks in F2FS" am: cb114c36d8
am: b7b419541b

Change-Id: I00d955ad5e8671c57b6a3acbe1e694fbf0b28d69
2018-08-03 17:11:47 -07:00