Paul Crowley
4928819dd5
Merge "Fix search for values in blkId output" am: 0fbc5af676
am: 56715503b5
...
am: 464ff37019
Change-Id: I5d47ddedc29cafa05424e6bfcfd6b99885614d7c
5 years ago
Paul Crowley
464ff37019
Merge "Fix search for values in blkId output" am: 0fbc5af676
...
am: 56715503b5
Change-Id: I9b24f0bd748a38ca29e2b258a54cd2b9bdcb7cc3
5 years ago
Paul Crowley
56715503b5
Merge "Fix search for values in blkId output"
...
am: 0fbc5af676
Change-Id: Ica4be0ea315c0aa6a2d6289139a88a8fa944deac
5 years ago
Treehugger Robot
0fbc5af676
Merge "Fix search for values in blkId output"
5 years ago
Paul Crowley
95abfa0cfd
Fix search for values in blkId output
...
Bug: 122497152
Test: atest tests/Utils_test.cpp
Test: adb shell sm partition disk:7,32 private ; adb logcat -d
Change-Id: Ic7d32bdbc0c55ce1d21f7f9e74c6a6fb3dcf332a
5 years ago
Daniel Rosenberg
c06a6f3eb4
Merge "Use global default_fstab instead of re-reading" am: 64f5e5bb38
am: fd5d1b173c
...
am: 8442c10304
Change-Id: I218e252ff21f51cb87bbd1bddc9a0c1048072476
5 years ago
Daniel Rosenberg
8442c10304
Merge "Use global default_fstab instead of re-reading" am: 64f5e5bb38
...
am: fd5d1b173c
Change-Id: I7ec6ba24f23b3ab62317802422eb2b01e616bce1
5 years ago
Daniel Rosenberg
fd5d1b173c
Merge "Use global default_fstab instead of re-reading"
...
am: 64f5e5bb38
Change-Id: Ief94647963db3c48f1aeb89e7d8ccd5f7cb63da7
5 years ago
Daniel Rosenberg
64f5e5bb38
Merge "Use global default_fstab instead of re-reading"
5 years ago
Daniel Rosenberg
253b44ea6d
Use global default_fstab instead of re-reading
...
VoldUtils already has a pre-parsed fstab. Use it instead.
Test: Checkpoint functions continue to work
Change-Id: I96cbab467a7b809c92c4f6cdf7a06abca8c5aa5e
5 years ago
Tom Cherry
1464410580
Merge "Move over to the C++ Fstab class" am: b6d5cd20d7
am: 4e8e70a949
...
am: f61f61a6a0
Change-Id: I90f0f0e1161463cef8542a586b53274ec5a2f5ee
5 years ago
Tom Cherry
f61f61a6a0
Merge "Move over to the C++ Fstab class" am: b6d5cd20d7
...
am: 4e8e70a949
Change-Id: I08d7937f718739f6444780cbd0cc72634dba841c
5 years ago
Tom Cherry
4e8e70a949
Merge "Move over to the C++ Fstab class"
...
am: b6d5cd20d7
Change-Id: Ia9c8b38cb014f30f0ca609bd71cfe1b0de9c27d3
5 years ago
Tom Cherry
b6d5cd20d7
Merge "Move over to the C++ Fstab class"
5 years ago
Tom Cherry
4c5bde2b92
Move over to the C++ Fstab class
...
Test: build and boot
Change-Id: Id3850c9c133f6644073a2439368501253a2a94a9
5 years ago
LongPing Wei
4341439292
Merge "Remove secontext.h, secontext.cpp, hash.h" am: eb00112e09
am: f058440b3b
...
am: b6bd5f21b8
Change-Id: I6e11c6a1d7633ef4e5f9c9d2f7fff19306c7753b
5 years ago
LongPing Wei
b6bd5f21b8
Merge "Remove secontext.h, secontext.cpp, hash.h" am: eb00112e09
...
am: f058440b3b
Change-Id: I339fb6d110cc76ae7bc650736f94880789b0d5a4
5 years ago
LongPing Wei
f058440b3b
Merge "Remove secontext.h, secontext.cpp, hash.h"
...
am: eb00112e09
Change-Id: Ie24ba4a5336a3a8537b43fa2996e53b0dbd85d74
5 years ago
Treehugger Robot
eb00112e09
Merge "Remove secontext.h, secontext.cpp, hash.h"
5 years ago
LongPing Wei
7f3ab95b8d
Remove secontext.h, secontext.cpp, hash.h
...
cryptfs.cpp and MetadataCrypt.cpp can use android::vold::sFsckContext directly.
hash.h is unuseful.
Test: make
Change-Id: I7acdac97d6ed1c9b2a5dc367fcea8aa2942192e8
5 years ago
Eric Biggers
447ee25b01
Merge "cryptfs: improve logging of dm-crypt device creation" am: f028d279ae
am: 26aaaeaf10
...
am: 71c2640ac0
Change-Id: Ifed1e1242cd0e5e6fec7cbd710a8a9cb1dcb67a6
5 years ago
Eric Biggers
71c2640ac0
Merge "cryptfs: improve logging of dm-crypt device creation" am: f028d279ae
...
am: 26aaaeaf10
Change-Id: I214cc397a8a20eb3cce0c3f41b069fb4fc4fe3c2
5 years ago
Eric Biggers
26aaaeaf10
Merge "cryptfs: improve logging of dm-crypt device creation"
...
am: f028d279ae
Change-Id: I348e4a6ac62cdd8575e1cdd0602a73442459d0de
5 years ago
Eric Biggers
f028d279ae
Merge "cryptfs: improve logging of dm-crypt device creation"
5 years ago
Eric Biggers
182d358d23
Merge "cryptfs: round down dm-crypt device size to crypto sector boundary" am: e7205eaa44
am: b45636cd35
...
am: 4b42da8e1a
Change-Id: I350a4a6cc8ed052ec5ac2208add168f6a0b5ba92
5 years ago
Eric Biggers
4b42da8e1a
Merge "cryptfs: round down dm-crypt device size to crypto sector boundary" am: e7205eaa44
...
am: b45636cd35
Change-Id: I8361f350fdc16079e9cff61d161af5f0641865d1
5 years ago
Eric Biggers
b45636cd35
Merge "cryptfs: round down dm-crypt device size to crypto sector boundary"
...
am: e7205eaa44
Change-Id: I4e1a75d8c34388c1b75ce4d9797f21530d01d1ac
5 years ago
Eric Biggers
e7205eaa44
Merge "cryptfs: round down dm-crypt device size to crypto sector boundary"
5 years ago
Eric Biggers
e1a7e77269
cryptfs: improve logging of dm-crypt device creation
...
Log the main configuration of the dm-crypt device -- the name, the
cipher, the keysize, the real device, and the length -- in addition to
the extra parameters which we were already logging.
(We can't simply log the actual string passed to the kernel, of course,
because that includes the key. So we choose the fields individually.)
Test: booted device configured to use FDE and checked the log message
Change-Id: Ia95de807c4fad68d93b7e7e73508a01e5139dc76
6 years ago
Eric Biggers
ed45ec3ae8
cryptfs: round down dm-crypt device size to crypto sector boundary
...
This is needed to make adoptable storage volumes work with a 4K crypto
sector size when the block device size is not a multiple of 4K.
It is fine to do this because the filesystem ends on a 4K boundary
anyway and doesn't use any partial block at the end.
Bug: 123375298
Test: booted device configured to use FDE with sector size 4k, ran
'sm set-virtual-disk true' and formatted the virtual SD card as
adoptable storage. Then did the same but with a temporary patch
that changed kSizeVirtualDisk to be misaligned
Change-Id: I95ee6d7dcaaa8989c674aea9988c09116e830b0c
6 years ago
Daniel Rosenberg
c89da3c1c3
Merge "Preserve options on remount in commitChanges" am: aaac873faf
am: b6c1c24f86
...
am: a20b92c0b0
Change-Id: Ifcef103b42a92614db1a5d77951f6bf027b92478
6 years ago
Daniel Rosenberg
a20b92c0b0
Merge "Preserve options on remount in commitChanges" am: aaac873faf
...
am: b6c1c24f86
Change-Id: I0d7963e307591612e6ab47bff27b49f8f6a1dd2f
6 years ago
Daniel Rosenberg
b6c1c24f86
Merge "Preserve options on remount in commitChanges"
...
am: aaac873faf
Change-Id: Ie09902ef6111cf2aa57014cb97dcdcbe04ecaf86
6 years ago
Treehugger Robot
aaac873faf
Merge "Preserve options on remount in commitChanges"
6 years ago
Daniel Rosenberg
14ca4acd86
Preserve options on remount in commitChanges
...
Copy the existing mount options when remounting f2fs for checkpointing
mode.
Bug: 123376509
Test: Boot with checkpointing, and ensure entries match fstab
Change-Id: If022d9872a44657b550ab892259230805716dc77
6 years ago
Daniel Rosenberg
38a2899523
Merge "Add supportsCheckpoint" am: 9b2b8fd459
am: 908a4569e9
...
am: 4cd2102637
Change-Id: I73fea54d60f27468a46bca872ae2f21bdfcb67a1
6 years ago
Daniel Rosenberg
4cd2102637
Merge "Add supportsCheckpoint" am: 9b2b8fd459
...
am: 908a4569e9
Change-Id: I44edd3fed37f5e41c29b8265eb549ab3d39bb0a6
6 years ago
Daniel Rosenberg
908a4569e9
Merge "Add supportsCheckpoint"
...
am: 9b2b8fd459
Change-Id: I893b20737f20c0a21be2a4068fb8b49cdb54ed80
6 years ago
Treehugger Robot
9b2b8fd459
Merge "Add supportsCheckpoint"
6 years ago
Daniel Rosenberg
9b667fbe41
Add supportsCheckpoint
...
This returns true if any entries in the fstab have checkpoint=
set.
Test: Call vdc checkpoint supportsCheckpoint. Should return 1
iff an fstab entry has checkpoint=fs or checkpoint=block set
Bug: 111020314
Change-Id: Ic79bc96ded4da6605f73992dcff542e7cb50d705
6 years ago
Eric Biggers
03cd2616b2
Merge "cryptfs: check for errors in create_encrypted_random_key()" am: f156c40404
am: 8938607c02
...
am: d043f574a8
Change-Id: I46e5b938b70b3fada8ced6c63a35d62df6a53354
6 years ago
Eric Biggers
8120a7a670
Merge "Utils: correctly handle read() errors in ReadRandomBytes()" am: a2bd436594
am: 038a274e8a
...
am: e5296cc04d
Change-Id: I0f81be91efee4512510d9e0422b96d8e75951cd4
6 years ago
Eric Biggers
d043f574a8
Merge "cryptfs: check for errors in create_encrypted_random_key()" am: f156c40404
...
am: 8938607c02
Change-Id: Iaa851a756275b0027e8415e92a6391d4640bbc1f
6 years ago
Eric Biggers
e5296cc04d
Merge "Utils: correctly handle read() errors in ReadRandomBytes()" am: a2bd436594
...
am: 038a274e8a
Change-Id: I64d09e4a3164749a915b079dcffe56940182a7d2
6 years ago
Eric Biggers
8938607c02
Merge "cryptfs: check for errors in create_encrypted_random_key()"
...
am: f156c40404
Change-Id: I67871c595dfeab96de3096e0bcf61c69261cb9cc
6 years ago
Eric Biggers
038a274e8a
Merge "Utils: correctly handle read() errors in ReadRandomBytes()"
...
am: a2bd436594
Change-Id: If33693132dd4954135070c2681053a49f885ed0e
6 years ago
Eric Biggers
f156c40404
Merge "cryptfs: check for errors in create_encrypted_random_key()"
6 years ago
Eric Biggers
a2bd436594
Merge "Utils: correctly handle read() errors in ReadRandomBytes()"
6 years ago
Sudheer Shanka
5504901bf0
Create a new MOUNT_EXTERNAL_LEGACY storage mode.
...
Apps that are already installed on the device before isolated_storage
feature is enabled will be granted MOUNT_EXTERNAL_LEGACY mode. In this
mode, /mnt/runtime/write will be mounted at /storage giving them same
level of access as in P.
A new mount directory /mnt/runtime/full is also created which will be
used for mounting at /storage for apps started with MOUNT_EXTERNAL_FULL
mode. This will allow apps with WRITE_MEDIA_STORAGE permission to
read/write anywhere on the secondary devices without needing to bypass
sdcardfs.
Bug: 121277410
Test: manual
Test: atest android.appsecurity.cts.ExternalStorageHostTest
Change-Id: Icc1ff9da35545692daedef7173d7c89290dd2766
6 years ago
Sudheer Shanka
811de623a0
Merge "Create new mount directory /mnt/runtime/full." am: b9fae464fc
am: f6c3c77f6c
...
am: dbd9c5ccbe
Change-Id: I90827fdccc294641db0cecaaa523140e9cb9d0fd
6 years ago