OSDN Git Service
Treehugger Robot [Wed, 14 Nov 2018 07:27:38 +0000 (07:27 +0000)]
Merge "Change AppFuse mount location to vold namespace"
Risan [Sat, 27 Oct 2018 02:56:45 +0000 (20:56 -0600)]
Change AppFuse mount location to vold namespace
Previously, AppFuse is mounted in system_server's mount namespace. This
CL moves the mount location to vold namespace.
Bug:
110379912
Test: testOpenProxyFileDescriptor passes
Change-Id: Id93c26d5a98842c78f27850c83e15df619cec1ab
Treehugger Robot [Tue, 13 Nov 2018 19:20:38 +0000 (19:20 +0000)]
Merge "StubVolume as first class Volume in Vold"
Risan [Sun, 28 Oct 2018 23:52:56 +0000 (08:52 +0900)]
StubVolume as first class Volume in Vold
StubVolume is a Volume that is maintained by external party such as the
ChromeOS processes in ARC++.
Bug:
110380403
Test: Tested on ARC++
Change-Id: I3198bd7283d5f60a524da3707dea7385ffec599d
Treehugger Robot [Mon, 5 Nov 2018 22:53:27 +0000 (22:53 +0000)]
Merge "Wait for dm device to be ready before format"
Paul Crowley [Tue, 30 Oct 2018 22:59:24 +0000 (15:59 -0700)]
Wait for dm device to be ready before format
It can sometimes take a moment for the dm-device to appear after
creation, causing operations on it such as formatting to fail.
Ensure the device exists before create_crypto_blk_dev returns.
Test: adb sm set-virtual-disk true and format as adoptable.
Bug:
117586466
Change-Id: Id8f571b551f50fc759e78d917e4ac3080e926722
Merged-In: Id8f571b551f50fc759e78d917e4ac3080e926722
Eric Biggers [Mon, 29 Oct 2018 17:19:39 +0000 (17:19 +0000)]
Merge changes from topic "e4crypt_to_fscrypt"
* changes:
vold: get the fscrypt kernel API declarations from linux/fs.h
vold: rename from "ext4 encryption" to fscrypt
Eric Biggers [Tue, 23 Oct 2018 20:07:43 +0000 (13:07 -0700)]
vold: get the fscrypt kernel API declarations from linux/fs.h
bionic now has linux/fs.h from the 4.14 kernel, which has the fscrypt
kernel API declarations. Replace the manual declarations in vold,
except for FS_AES_256_XTS_KEY_SIZE which is not available.
Test: built, booted device with f2fs encryption
Change-Id: I6a0e3117eaebe3baac7385421afce2169d46ad55
Eric Biggers [Tue, 23 Oct 2018 20:06:55 +0000 (13:06 -0700)]
vold: rename from "ext4 encryption" to fscrypt
We support file-based encryption on both ext4 and f2fs now, and the
kernel API is the same. So rename things appropriately in vold:
e4crypt => fscrypt
ext4enc => fscrypt
Ext4Crypt => FsCrypt
EXT4_* => FS_*
ext4_encryption_key => fscrypt_key
Additionally, the common functions shared by 'vold' and 'init' are now
in libfscrypt rather than ext4_utils. So update vold to link to
libfscrypt and include the renamed headers.
Note: there's a chance of 'fscrypt' being confused with the dm-crypt
based encryption code in vold which is called 'cryptfs'. However,
fscrypt is the name used in the kernel for ext4/f2fs/ubifs encryption,
and it's preferable to use the same name in userspace.
Test: built, booted device with f2fs encryption
Change-Id: I2a46a49f30d9c0b73d6f6fe09e4a4904d4138ff6
Bill Yi [Wed, 24 Oct 2018 21:48:22 +0000 (14:48 -0700)]
Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: I112d144eac39f426e22d3a66e4fe298306010c13
Bill Yi [Fri, 19 Oct 2018 19:20:56 +0000 (12:20 -0700)]
Merge pi-dr1-dev to aosp-master
Change-Id: I5f9eb0c7ea0a3ba88865854e28b73806011d323e
Daniel Rosenberg [Wed, 17 Oct 2018 00:12:32 +0000 (17:12 -0700)]
[automerger skipped] Merge "Remove spurious function declaration"
am:
090e05bd02 -s ours
Change-Id: I919eeb0ec529c444ea0a32835a4b0306c07fab45
Treehugger Robot [Tue, 16 Oct 2018 23:55:28 +0000 (23:55 +0000)]
Merge "Remove spurious function declaration"
Daniel Rosenberg [Tue, 16 Oct 2018 21:34:54 +0000 (14:34 -0700)]
Merge "Switch to exceptions for most cp calls"
am:
ece7e231a6
Change-Id: Ib02d0a002f31834bb07cf8dd9446cec942880a77
Daniel Rosenberg [Fri, 12 Oct 2018 23:24:21 +0000 (16:24 -0700)]
Remove spurious function declaration
Test: Nothing changes
Change-Id: I27f0d832d33099efe25794987c307d773b5d987c
Merged-In: Icba16578608a6cbf922472e9d4ae5b8cf5f016c6
Treehugger Robot [Tue, 16 Oct 2018 21:14:34 +0000 (21:14 +0000)]
Merge "Switch to exceptions for most cp calls"
Daniel Rosenberg [Thu, 11 Oct 2018 01:52:04 +0000 (18:52 -0700)]
Switch to exceptions for most cp calls
This switches the checkpoint calls that don't need to return a value
to return 0 on success, and an error on failure. This will be transalted
to exceptions for java binder users. needsCheckpoint and needsRollback
still return a boolean value.
Test: vdc setCheckpoint 2 then reboot 3 times checking state
Bug:
112901762
Change-Id: Idd3b5e6036631562a86d5123f533b86cf3bd6032
Merged-In: Idd3b5e6036631562a86d5123f533b86cf3bd6032
Daniel Rosenberg [Tue, 16 Oct 2018 04:19:59 +0000 (21:19 -0700)]
Merge "Handle retry count"
am:
e74587af4d
Change-Id: I76c8625e58de0efb7b1d937ce7bcb8499c7fc279
Treehugger Robot [Tue, 16 Oct 2018 01:25:34 +0000 (01:25 +0000)]
Merge "Handle retry count"
Daniel Rosenberg [Wed, 10 Oct 2018 02:26:57 +0000 (19:26 -0700)]
Handle retry count
Test: vdc setCheckpoint 2 then reboot 3 times checking state
Bug:
112901762
Change-Id: I85a71d059bca27b76175b9bd8465cc453f0ddb8d
Bill Rassieur [Wed, 10 Oct 2018 17:33:05 +0000 (17:33 +0000)]
Merge PPR2.181005.003 from pi-release-2 into pi-platform-release.
Change-Id: Ifb0130fa2b413d1b8a769684cffb6c6621ea9859
BUG:
117431430
Daniel Rosenberg [Fri, 5 Oct 2018 01:48:04 +0000 (18:48 -0700)]
Merge "Add checkpointing support for A/B updates"
am:
ba1752008d
Change-Id: I62cb1c6dce6c9eca1c3651b05d23cb893559d370
Daniel Rosenberg [Fri, 5 Oct 2018 01:31:18 +0000 (01:31 +0000)]
Merge "Add checkpointing support for A/B updates"
Paul Lawrence [Thu, 4 Oct 2018 00:28:34 +0000 (17:28 -0700)]
Merge "Use unique points for fstab"
am:
1e1893812c
Change-Id: I64ce90c05417b8b96ddc1e96cd505ca2aff86082
Treehugger Robot [Wed, 3 Oct 2018 23:57:39 +0000 (23:57 +0000)]
Merge "Use unique points for fstab"
Daniel Rosenberg [Wed, 3 Oct 2018 00:40:44 +0000 (17:40 -0700)]
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
Paul Lawrence [Wed, 3 Oct 2018 21:14:52 +0000 (14:14 -0700)]
Use unique points for fstab
Test: Checkpoint test script runs and passes
Change-Id: I13005da22aef5fda3d1e0941949db02ff0ff0870
Paul Lawrence [Wed, 3 Oct 2018 20:31:25 +0000 (13:31 -0700)]
Merge "Make checkpointing work on ext4"
am:
ac244261c8
Change-Id: I78da54f117c9c2710d2d1fbe4ec7e902bf944d5d
Treehugger Robot [Wed, 3 Oct 2018 20:15:48 +0000 (20:15 +0000)]
Merge "Make checkpointing work on ext4"
Paul Lawrence [Fri, 21 Sep 2018 17:49:57 +0000 (10:49 -0700)]
Make checkpointing work on ext4
Test: All tests pass
Change-Id: I2a6cdf1edfe752f4633e1931e75d18659653938c
Mark Salyzyn [Tue, 2 Oct 2018 22:24:57 +0000 (15:24 -0700)]
Merge "Protect /mnt/scratch from stale umount on userdebug"
am:
b39e6f2887
Change-Id: I2505bc0cf4fe31123c47bd10619830298c3a033a
Treehugger Robot [Tue, 2 Oct 2018 21:31:12 +0000 (21:31 +0000)]
Merge "Protect /mnt/scratch from stale umount on userdebug"
Mark Salyzyn [Thu, 20 Sep 2018 17:09:27 +0000 (10:09 -0700)]
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
Sudheer Shanka [Sat, 29 Sep 2018 00:33:19 +0000 (17:33 -0700)]
Merge "Remove unmount_tree in VolumeManager."
am:
9931db7e59
Change-Id: Ib02f999eb66c5685752abf99c0c77ba49dd60d74
Sudheer Shanka [Fri, 28 Sep 2018 23:49:51 +0000 (23:49 +0000)]
Merge "Remove unmount_tree in VolumeManager."
Sudheer Shanka [Thu, 27 Sep 2018 21:53:51 +0000 (14:53 -0700)]
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
Sudheer Shanka [Thu, 27 Sep 2018 20:14:30 +0000 (13:14 -0700)]
Merge "Add unmountTree to utils."
am:
a64572431e
Change-Id: Ifdbdc90e22b4a681dcf0766919807109cf78ffca
Sudheer Shanka [Thu, 27 Sep 2018 19:54:23 +0000 (19:54 +0000)]
Merge "Add unmountTree to utils."
Sudheer Shanka [Tue, 25 Sep 2018 21:22:07 +0000 (14:22 -0700)]
Add unmountTree to utils.
Bug:
111890351
Test: builds without any errors
Change-Id: I62a94c9e8d101756b686b402774f08a1d71cf875
Daniel Rosenberg [Tue, 25 Sep 2018 22:10:22 +0000 (15:10 -0700)]
Merge "Add support for checkpointing"
am:
a3381ffc3f
Change-Id: I52e70b0f886281280bb050751060b975e103376d
Treehugger Robot [Tue, 25 Sep 2018 21:52:19 +0000 (21:52 +0000)]
Merge "Add support for checkpointing"
Oleksiy Avramchenko [Mon, 24 Sep 2018 19:01:36 +0000 (12:01 -0700)]
Merge changes from topic "exfat-update"
am:
a2a227e382
Change-Id: I13daa826be04c72ab18175d3ceee6212b7304731
Treehugger Robot [Mon, 24 Sep 2018 18:52:56 +0000 (18:52 +0000)]
Merge changes from topic "exfat-update"
* changes:
Use exFAT for SDXC cards
Add GetBlockDevSize, GetBlockDevSectors helpers
Jeff Sharkey [Mon, 24 Sep 2018 17:25:07 +0000 (10:25 -0700)]
Merge "Update vold to log only debug or higher level messages."
am:
9bd07d8760
Change-Id: Idd8482fc0287d51d962ead0dd4c1f8f8e514d9de
Jeff Sharkey [Mon, 24 Sep 2018 17:06:25 +0000 (17:06 +0000)]
Merge "Update vold to log only debug or higher level messages."
Oleksiy Avramchenko [Wed, 23 May 2018 16:59:48 +0000 (18:59 +0200)]
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
Oleksiy Avramchenko [Wed, 23 May 2018 08:50:46 +0000 (10:50 +0200)]
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
Daniel Rosenberg [Tue, 28 Aug 2018 08:58:49 +0000 (01:58 -0700)]
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
Sudheer Shanka [Fri, 21 Sep 2018 17:54:54 +0000 (10:54 -0700)]
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
Yifan Hong [Fri, 21 Sep 2018 05:38:46 +0000 (22:38 -0700)]
Merge "health.filesystem HAL renamed to health.storage"
am:
15b9656ae9
Change-Id: Id587f968eea321254589a0d0f3cd5fc23be56739
Paul Crowley [Fri, 21 Sep 2018 05:38:27 +0000 (22:38 -0700)]
Merge "clang-format the rest of the files"
am:
1934619b8b
Change-Id: I6265495330a13f687628b2143b9f78eb25380104
Yifan Hong [Thu, 20 Sep 2018 17:26:53 +0000 (17:26 +0000)]
Merge "health.filesystem HAL renamed to health.storage"
Treehugger Robot [Thu, 20 Sep 2018 17:14:35 +0000 (17:14 +0000)]
Merge "clang-format the rest of the files"
Paul Crowley [Tue, 18 Sep 2018 22:14:18 +0000 (15:14 -0700)]
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
Paul Crowley [Thu, 20 Sep 2018 00:13:35 +0000 (17:13 -0700)]
Merge "clang-format many files."
am:
a676df01e2
Change-Id: Iecaed7fd342df49d628c2bc68f1bf5439163d918
Paul Crowley [Wed, 19 Sep 2018 21:06:17 +0000 (21:06 +0000)]
Merge "clang-format many files."
Yifan Hong [Wed, 19 Sep 2018 17:28:16 +0000 (10:28 -0700)]
health.filesystem HAL renamed to health.storage
Bug:
111655771
Test: compiles
Change-Id: Ibfcab4d116d735ba2f80a8b0ead314138a7ba23d
Merged-In: Ibfcab4d116d735ba2f80a8b0ead314138a7ba23d
Paul Crowley [Wed, 19 Sep 2018 16:09:18 +0000 (09:09 -0700)]
Merge "vold: metadata encryption: ensure F2FS GC targets correct device."
am:
3adf30745a
Change-Id: I9df60bbc12d7c70c0bd0fbda1e8604051306a8ee
Paul Crowley [Wed, 19 Sep 2018 15:59:24 +0000 (15:59 +0000)]
Merge "vold: metadata encryption: ensure F2FS GC targets correct device."
Paul Crowley [Tue, 18 Sep 2018 20:30:21 +0000 (13:30 -0700)]
clang-format many files.
Test: Format-only changes; treehugger suffices.
Change-Id: I23cde3f0bbcac13bef555d13514e922c79d5ad48
Jaegeuk Kim [Sun, 29 Jul 2018 13:56:57 +0000 (06:56 -0700)]
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>
Roman Kiryanov [Tue, 18 Sep 2018 14:26:00 +0000 (07:26 -0700)]
Merge "Do not crash if secontext is nullptr"
am:
6418bb7d34
Change-Id: Iad725cb3c6a40a0917106dee3b2b604b1cb921a5
Treehugger Robot [Tue, 18 Sep 2018 14:15:13 +0000 (14:15 +0000)]
Merge "Do not crash if secontext is nullptr"
Roman Kiryanov [Thu, 26 Jul 2018 20:41:14 +0000 (13:41 -0700)]
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>
Yifan Hong [Mon, 17 Sep 2018 22:50:29 +0000 (15:50 -0700)]
Merge "vold uses health filesystem HAL"
am:
fa96af82f3
Change-Id: I232955955686a2767d290863278b49f4f99520c5
Treehugger Robot [Mon, 17 Sep 2018 22:30:34 +0000 (22:30 +0000)]
Merge "vold uses health filesystem HAL"
Yifan Hong [Fri, 10 Aug 2018 20:50:46 +0000 (13:50 -0700)]
vold uses health filesystem HAL
to runDevGc(). This fixes a Treble violation.
Bug:
111655771
Test: manual
Change-Id: I53d6db6ffa99e43e281f8086442151692c1826ca
Jaegeuk Kim [Thu, 13 Sep 2018 19:49:30 +0000 (12:49 -0700)]
Merge "fix wrong ioctl direction for F2FS_IOC_GET_PIN_FILE"
am:
3a7f95af09
Change-Id: I74d6b44bb7de16b57e9ed0b42cec70e7633b28e1
Treehugger Robot [Thu, 13 Sep 2018 19:03:41 +0000 (19:03 +0000)]
Merge "fix wrong ioctl direction for F2FS_IOC_GET_PIN_FILE"
Jaegeuk Kim [Wed, 12 Sep 2018 17:10:51 +0000 (10:10 -0700)]
fix wrong ioctl direction for F2FS_IOC_GET_PIN_FILE
Change-Id: I0cf212c3e1770e233ae1f70e7fc4a6d70b82583e
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Jeff Sharkey [Tue, 11 Sep 2018 21:00:11 +0000 (14:00 -0700)]
Merge "vold should be fully developed in AOSP."
am:
de85ef5c37
Change-Id: I41da6719f6d9fc4a358bb8a0d99358360d779182
Treehugger Robot [Tue, 11 Sep 2018 20:50:05 +0000 (20:50 +0000)]
Merge "vold should be fully developed in AOSP."
Jeff Sharkey [Tue, 11 Sep 2018 17:25:23 +0000 (11:25 -0600)]
vold should be fully developed in AOSP.
Bug:
113136846
Test: manual
Change-Id: Ifdd54260153d47e47aca5f422bffcc828d45dc28
android-build-team Robot [Thu, 16 Aug 2018 16:41:06 +0000 (16:41 +0000)]
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
Greg Kaiser [Wed, 1 Aug 2018 20:15:19 +0000 (13:15 -0700)]
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
(
38723f23ff521e95ed295f500e6529c52a994c9f) 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
17059fe53b7f535886918d06fea58a90930862fc)
Jaegeuk Kim [Mon, 13 Aug 2018 21:06:05 +0000 (14:06 -0700)]
Merge "vold: Grant root group"
am:
732def209c
Change-Id: If13da04a9cff5a54665626397b9c6bc165df10c7
Treehugger Robot [Mon, 13 Aug 2018 20:54:13 +0000 (20:54 +0000)]
Merge "vold: Grant root group"
Jaegeuk Kim [Tue, 7 Aug 2018 19:31:05 +0000 (12:31 -0700)]
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>
Paul Crowley [Wed, 8 Aug 2018 18:33:12 +0000 (11:33 -0700)]
Merge "Switch pattern/PIN constants to match values in cryptfs.h" am:
92f5db4a06
am:
6d418929f0
Change-Id: I68dc3538393c51c2055535eb55587ebb7b697ba7
Greg Kaiser [Wed, 8 Aug 2018 18:05:38 +0000 (11:05 -0700)]
Merge "cryptfs: Remove Speck support" am:
cf0cb0bc1f
am:
421e1059b7
Change-Id: I26fe4bc95f91f410cf1242e698e94ed4231c01ee
Paul Crowley [Wed, 8 Aug 2018 18:01:30 +0000 (11:01 -0700)]
Merge "Switch pattern/PIN constants to match values in cryptfs.h"
am:
92f5db4a06
Change-Id: I6eb0b99b9fbd25ed8f189cbc914a9a3bd7cb3069
Greg Kaiser [Wed, 8 Aug 2018 17:41:09 +0000 (10:41 -0700)]
Merge "cryptfs: Remove Speck support"
am:
cf0cb0bc1f
Change-Id: I4e44dd132d94b7583ab2df50469ac80bf9ae7a9b
Xin Li [Wed, 8 Aug 2018 02:20:42 +0000 (19:20 -0700)]
Merge "Merge Android Pie into master" am:
7fcaa13d4c
am:
2042258f38
Change-Id: If376d606aa23dbb916bc8255da9febc5f095ca5a
Xin Li [Tue, 7 Aug 2018 22:51:17 +0000 (15:51 -0700)]
Merge "Merge Android Pie into master"
am:
7fcaa13d4c
Change-Id: I99ee2ff5662766207659cfa1afc9f337f238c781
Treehugger Robot [Tue, 7 Aug 2018 22:03:11 +0000 (22:03 +0000)]
Merge "Switch pattern/PIN constants to match values in cryptfs.h"
Treehugger Robot [Tue, 7 Aug 2018 21:11:50 +0000 (21:11 +0000)]
Merge "cryptfs: Remove Speck support"
Paul Crowley [Tue, 3 Jul 2018 18:49:00 +0000 (11:49 -0700)]
Switch pattern/PIN constants to match values in cryptfs.h
Bug:
111051602
Test: Steps to reproduce in b/
111051602
Change-Id: I21955f41d2594917d5baa1bc4d61da0106cd9170
Greg Kaiser [Wed, 1 Aug 2018 20:15:19 +0000 (13:15 -0700)]
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
(
38723f23ff521e95ed295f500e6529c52a994c9f) 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
Xin Li [Tue, 7 Aug 2018 16:51:28 +0000 (16:51 +0000)]
Merge "Merge Android Pie into master"
Xin Li [Mon, 6 Aug 2018 23:52:51 +0000 (16:52 -0700)]
Merge Android Pie into master
Bug:
112104996
Change-Id: Ibda46522d646c0a391c7d19663e4ffdb3d4b30fc
Jaegeuk Kim [Sat, 4 Aug 2018 00:11:47 +0000 (17:11 -0700)]
Merge "secdiscard: should pin_file to avoid moving blocks in F2FS" am:
cb114c36d8
am:
b7b419541b
Change-Id: I00d955ad5e8671c57b6a3acbe1e694fbf0b28d69
Jaegeuk Kim [Fri, 3 Aug 2018 23:55:37 +0000 (16:55 -0700)]
Merge "secdiscard: should pin_file to avoid moving blocks in F2FS"
am:
cb114c36d8
Change-Id: I3376ce6a9844d26c4e5658fc95477b8d6c9c0afe
Treehugger Robot [Fri, 3 Aug 2018 23:23:40 +0000 (23:23 +0000)]
Merge "secdiscard: should pin_file to avoid moving blocks in F2FS"
Jaegeuk Kim [Thu, 2 Aug 2018 19:41:45 +0000 (12:41 -0700)]
secdiscard: should pin_file to avoid moving blocks in F2FS
This file should avoid F2FS GC, since it directly access block device based
on fibmap.
Bug:
111659036
Change-Id: I15aef8175c23ba4029eb580e2dba59c77cca8227
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Stephen Hines [Wed, 25 Jul 2018 03:27:59 +0000 (20:27 -0700)]
[automerger skipped] Merge "Use std::move() to prevent unnecessary copying. [DO NOT MERGE]" am:
9b18b764bc -s ours
am:
2abec98856 -s ours
Change-Id: I53771e374afee33e97cdd34820ba46e1858621bf
Stephen Hines [Wed, 25 Jul 2018 03:25:09 +0000 (20:25 -0700)]
[automerger skipped] Merge "Use std::move() to prevent unnecessary copying. [DO NOT MERGE]"
am:
9b18b764bc -s ours
Change-Id: I15fbe10ff91d910478dd67c93fbd9bff8f3fee36
Treehugger Robot [Wed, 25 Jul 2018 03:15:21 +0000 (03:15 +0000)]
Merge "Use std::move() to prevent unnecessary copying. [DO NOT MERGE]"
Stephen Hines [Fri, 20 Jul 2018 18:19:53 +0000 (11:19 -0700)]
Use std::move() to prevent unnecessary copying. [DO NOT MERGE]
Bug: http://b/
110779387
Test: Builds with new toolchain.
Change-Id: I735a3ecda11a662edaddbe21c36433a91bb8a7f1
Bowgo Tsai [Tue, 3 Jul 2018 02:07:37 +0000 (19:07 -0700)]
Merge "Do not unmount /mnt/product/* when vold starts" am:
4a625453bf
am:
3d4fb41f3d
Change-Id: I264a9ed62e8c1884e928fe17edd35cf99a382129
Bowgo Tsai [Tue, 3 Jul 2018 02:03:58 +0000 (19:03 -0700)]
Merge "Do not unmount /mnt/product/* when vold starts"
am:
4a625453bf
Change-Id: Idd91865540106b5030f74b26037b61c00719ef28
OSDN Git Service
