Jeff Sharkey
c8df7fb173
am cd52cca7: am 27f98a12: am 20642ae7: Give secondary users read-only physical cards.
...
* commit 'cd52cca79c1fc96441d6348989722f4527875851':
Give secondary users read-only physical cards.
9 years ago
Jeff Sharkey
cd52cca79c
am 27f98a12: am 20642ae7: Give secondary users read-only physical cards.
...
* commit '27f98a12df1e9513124448d0d7464664d798cc60':
Give secondary users read-only physical cards.
9 years ago
Jeff Sharkey
27f98a12df
am 20642ae7: Give secondary users read-only physical cards.
...
* commit '20642ae71aa93ec2658d09c92a1ffc3844f5a555':
Give secondary users read-only physical cards.
9 years ago
Jeff Sharkey
20642ae71a
Give secondary users read-only physical cards.
...
Long ago, we mounted secondary physical cards as readable by all
users on the device, which enabled the use-case of loading media on
a card and viewing it from all users.
More recently, we started giving write access to these secondary
physical cards, but this created a one-directional channel for
communication across user boundaries; something that CDD disallows.
This change is designed to give us the best of both worlds: the
package-specific directories are writable for the user that mounted
the card, but access to those "Android" directories are blocked for
all other users. Other users remain able to read content elsewhere
on the card.
Bug: 22787184
Change-Id: I75dbd339f11402ae774c7e4b8f2b15ee216270e8
9 years ago
Yusuke Sato
70d8ef73a2
Merge "Stop doing full fsck on private f2fs partitions"
9 years ago
Jeff Sharkey
16b3ba4bd7
am 90db4d90: am 78003caf: am 32679a82: Create user directory on emulated storage.
...
* commit '90db4d909a95cb2a9c9143a4b116822dd6cf4707':
Create user directory on emulated storage.
9 years ago
Jeff Sharkey
90db4d909a
am 78003caf: am 32679a82: Create user directory on emulated storage.
...
* commit '78003caff32e8220ebd6ca89703916d9297b77b3':
Create user directory on emulated storage.
9 years ago
Jeff Sharkey
78003caff3
am 32679a82: Create user directory on emulated storage.
...
* commit '32679a82d9542ec26ea8b4e32d29dd7b02202611':
Create user directory on emulated storage.
9 years ago
Jeff Sharkey
15c6489aa9
am 32679a82: Create user directory on emulated storage.
...
* commit '32679a82d9542ec26ea8b4e32d29dd7b02202611':
Create user directory on emulated storage.
9 years ago
Yusuke Sato
0765cf98fc
Stop doing full fsck on private f2fs partitions
...
This is safe because we run 'f2fs.fsck -f' on all writable
/dev/block* paritions on shutdown.
Bug: 21853106
Change-Id: I368a8676093c97e70ad7c09e9b71665d3c445a16
9 years ago
Jeff Sharkey
32679a82d9
Create user directory on emulated storage.
...
When mounting a primary external storage device that is multi-user
aware, ensure that the user-specific directory actually exists before
moving forward.
Bug: 22472026
Change-Id: I33c8eed261a9c0d5acedd5be6133ed9990679d08
9 years ago
Paul Crowley
07897ad476
Restore setusercryptopolicies, lost in a merge.
...
Looks like when I merged the change that introduced
CryptCommandListener.cpp into my changes, I managed to lose this
function. Without it, non-primary users will stop working after
a reboot.
Change-Id: I9c959b6513698419bc09db69db943d01a296b35e
9 years ago
Paul Crowley
7331a963d5
am c93442ee: am 93363482: Evict the key before we delete it.
...
* commit 'c93442eea4b74858b0b45c69f0642d05bce7e8e8':
Evict the key before we delete it.
9 years ago
Paul Crowley
60aafe382d
am 95b5c3de: am e76d9e6b: Fix erroneous comment in secdiscard.cpp, plus style fixes.
...
* commit '95b5c3dedcec60ea8d31c192592e0cfdc26af730':
Fix erroneous comment in secdiscard.cpp, plus style fixes.
9 years ago
Paul Crowley
722afdd0f6
am c10f4331: am cd307b7c: Scrub the key from the disk with BLKSECDISCARD.
...
* commit 'c10f43311319b63e60fcdf8f29330f110504fc64':
Scrub the key from the disk with BLKSECDISCARD.
9 years ago
Paul Crowley
fcccd89378
am f4000e48: (-s ours) am 5bd0daf9: Add tool for scrubbing files with BLKSECDISCARD.
...
* commit 'f4000e480d5da9df8c0205b28160e60a0b47c77d':
Add tool for scrubbing files with BLKSECDISCARD.
9 years ago
Paul Crowley
a3f6e9714a
am 41ddfc15: (-s ours) am b33e8873: Add "cryptfs deleteuserkey" command to vold.
...
* commit '41ddfc151d6a071dc5343246e6d47c996364ddf7':
Add "cryptfs deleteuserkey" command to vold.
9 years ago
Paul Crowley
f62eae3aeb
am 17ceaff2: (-s ours) am 95376d61: Add vold commands for setting up per-user encrypted user directories
...
* commit '17ceaff271f735cc4827f34309ac035d61bb3aef':
Add vold commands for setting up per-user encrypted user directories
9 years ago
Paul Crowley
fcea94d592
am 2db4367d: am f25a35a1: (-s ours) Break key installation into its own function so we can install non-master keys.
...
* commit '2db4367d0af338dbf4db49aebf0dc9853ce8a23a':
Break key installation into its own function so we can install non-master keys.
9 years ago
Paul Crowley
c93442eea4
am 93363482: Evict the key before we delete it.
...
* commit '9336348200758d067fed164368636521b4e58621':
Evict the key before we delete it.
9 years ago
Paul Crowley
95b5c3dedc
am e76d9e6b: Fix erroneous comment in secdiscard.cpp, plus style fixes.
...
* commit 'e76d9e6be65c9af52a0ed722267521256269cc18':
Fix erroneous comment in secdiscard.cpp, plus style fixes.
9 years ago
Paul Crowley
c10f433113
am cd307b7c: Scrub the key from the disk with BLKSECDISCARD.
...
* commit 'cd307b7c6301593727892d1fa9bb92aadb5fdaca':
Scrub the key from the disk with BLKSECDISCARD.
9 years ago
Paul Crowley
f4000e480d
am 5bd0daf9: Add tool for scrubbing files with BLKSECDISCARD.
...
* commit '5bd0daf926ea8096dc091d7b99ff9e56cc5746aa':
Add tool for scrubbing files with BLKSECDISCARD.
9 years ago
Paul Crowley
41ddfc151d
am b33e8873: Add "cryptfs deleteuserkey" command to vold.
...
* commit 'b33e8873ea78b92e536aa33f48130a91ca150f0c':
Add "cryptfs deleteuserkey" command to vold.
9 years ago
Paul Crowley
17ceaff271
am 95376d61: Add vold commands for setting up per-user encrypted user directories
...
* commit '95376d612c91236c8cd751b9af02c9aa57f4870f':
Add vold commands for setting up per-user encrypted user directories
9 years ago
Paul Crowley
2db4367d0a
am f25a35a1: (-s ours) Break key installation into its own function so we can install non-master keys.
...
* commit 'f25a35a1c98d4fac118ee9abe34d6bbf2d3a2201':
Break key installation into its own function so we can install non-master keys.
9 years ago
Paul Lawrence
e1c427d6ed
am 93237251: am f733ae63: Don\'t break on setting default password
...
* commit '93237251d5891bb62dd27f00b115a52425ff3d2c':
Don't break on setting default password
9 years ago
Paul Crowley
9336348200
Evict the key before we delete it.
...
Change-Id: I9eef440a1f406c2c73c859f5ae7cee35f6a36ca4
9 years ago
Paul Crowley
e76d9e6be6
Fix erroneous comment in secdiscard.cpp, plus style fixes.
...
Bug: 19706593
(cherry picked from commit 747e1f7a6d
)
Change-Id: I9a605c736a2fa909cd4999e1e8d022d49a562767
9 years ago
Paul Crowley
cd307b7c63
Scrub the key from the disk with BLKSECDISCARD.
...
Bug: 19706593
(cherry-picked from commit 8d0cd7ffd903a753c6bb5c6f33987a7a66621cef)
Change-Id: Ieea73da233fe53767b5adcdb4d49f9bb00fedac1
9 years ago
Paul Crowley
5bd0daf926
Add tool for scrubbing files with BLKSECDISCARD.
...
Bug: 19706593
(based on work in commit 8d0cd7ffd903a753c6bb5c6f33987a7a66621cef)
Change-Id: I9699275a63f2d0a110435bd4a725d7dfcce4ed90
9 years ago
Paul Crowley
b33e8873ea
Add "cryptfs deleteuserkey" command to vold.
...
Bug: 19706593
(cherry-picked from commit eebf44563b
)
Change-Id: I50dc4c39595c06bf0016d6a490130bbbc25de91b
9 years ago
Paul Crowley
95376d612c
Add vold commands for setting up per-user encrypted user
...
directories
Bug: 19704432
(cherry-picked from commit 75a5202d9f
)
Change-Id: I733e8745ec21f8e53c2cc6d8a98313275db7d897
9 years ago
Paul Crowley
f25a35a1c9
Break key installation into its own function so we can install
...
non-master keys.
Bug: 19704432
(cherry-picked from commit 1da96dc549
)
Change-Id: I762e8f6c927db3a337fa8ce6bd428262d9e05c7a
9 years ago
Paul Lawrence
93237251d5
am f733ae63: Don\'t break on setting default password
...
* commit 'f733ae6306b1a6226492015e7f475a17df32f681':
Don't break on setting default password
9 years ago
Paul Lawrence
f733ae6306
Don't break on setting default password
...
Bug: 22329642
Change-Id: I58dac4dba8e65c7015d50ca0c3575f77f550a215
9 years ago
Jeff Sharkey
9eee2f3767
am 10f78c56: am 81f55c6d: Mount emulated volumes as consistent location.
...
* commit '10f78c56798f0aa7d6209ecc6a9e3a273c1dd038':
Mount emulated volumes as consistent location.
9 years ago
Jeff Sharkey
10f78c5679
am 81f55c6d: Mount emulated volumes as consistent location.
...
* commit '81f55c6dc1a14ed68e404fa3a2c244dd343e4990':
Mount emulated volumes as consistent location.
9 years ago
Jeff Sharkey
0d3fe8152e
am 81f55c6d: Mount emulated volumes as consistent location.
...
* commit '81f55c6dc1a14ed68e404fa3a2c244dd343e4990':
Mount emulated volumes as consistent location.
9 years ago
Jeff Sharkey
81f55c6dc1
Mount emulated volumes as consistent location.
...
We really only support a single emulated volume on the device at a
time, either on internal storage, or moved to a private volume. To
avoid kicking off a giant rescan of all media when moved, keep all
the paths the same when mounted as primary.
Also ensure we have /data/media/0 ready on private volumes.
Bug: 20275423
Change-Id: I0c102f430b865ca7536772b1fae56d8c9660a97a
9 years ago
Jeff Sharkey
5ceafb42ca
Merge commit '3ff337db' into merge
...
Change-Id: I3c09d1f888da684b50d79a8e539f47c8bcf85646
9 years ago
Jeff Sharkey
3ff337db56
am c86ab6f5: Trim both internal and adopted private storage.
...
* commit 'c86ab6f538bec63638c168d6c843fe7cf73add3b':
Trim both internal and adopted private storage.
9 years ago
Jeff Sharkey
c86ab6f538
Trim both internal and adopted private storage.
...
Refactor fstrim code to be encapsulated in unique task object, and
give it option of benchmarking when finished. Trimming now includes
both storage from fstab and adopted private volumes. Cleaner timing
stats are logged for each unique volume.
Add wakelock during ongoing async move tasks. Push disk sysfs path
to framework so it can parse any SD card registers as desired.
Bug: 21831325
Change-Id: I76577685f5cae4929c251ad314ffdaeb5eb1c8bf
9 years ago
Jeff Sharkey
bf19f7e389
am 1458955f: am c7b5b570: Null-terminate readlink() result, full remount.
...
* commit '1458955fec0a4973b68795b334530578241532a8':
Null-terminate readlink() result, full remount.
9 years ago
Jeff Sharkey
1458955fec
am c7b5b570: Null-terminate readlink() result, full remount.
...
* commit 'c7b5b570bd05ed3bc921b0c2dc346416a52b4e3e':
Null-terminate readlink() result, full remount.
9 years ago
Jeff Sharkey
c7b5b570bd
Null-terminate readlink() result, full remount.
...
In order to compare results from readlink() calls, we need to null
terminate the read value, otherwise we can end up doing an infinitely
recursive remount in the root namespace.
When remounting inside a namespace, unmount all existing mounts before
mounting the new storage into place. This also means we need to mount
the user-specific symlinks back into place.
Skip spinning up the FUSE daemon when not visible, otherwise we get
stuck waiting for a daemon that never shows up.
Bug: 22192518, 22204412
Change-Id: Icc7db822354ab7ffc47c39cd0611f65edecc32e5
9 years ago
Jeff Sharkey
58ef44be0e
am 8da07375: am 63123c06: Last ditch check for partition on raw disk.
...
* commit '8da07375f9336a23d9b0af341cbf57b8f2248f74':
Last ditch check for partition on raw disk.
9 years ago
Jeff Sharkey
8da07375f9
am 63123c06: Last ditch check for partition on raw disk.
...
* commit '63123c067a4e709198d9b8d3279c98561f8c990e':
Last ditch check for partition on raw disk.
9 years ago
Jeff Sharkey
63123c067a
Last ditch check for partition on raw disk.
...
Some storage devices can be formatted as bare partitions, without an
MBR or GPT header. If we found no partitions, try poking at the raw
disk, and treat it as a public volume if we found a valid filesystem.
Bug: 20503551
Change-Id: I80304e1ad865435321c341b667c0daf2daf4d56c
9 years ago
Jeff Sharkey
c36ffa0010
am 0deb385f: am 66270a21: Let\'s reinvent storage, yet again!
...
* commit '0deb385f85b4569d98ed9d1df96de1761b378c17':
Let's reinvent storage, yet again!
9 years ago