Daichi Hirono
37f09e0d8b
Merge "Send file descriptor of /dev/fuse from vold."
9 years ago
Paul Crowley
ee6b1642b1
Use Jeff's C++ style for finding the subcommand consistently.
...
Change-Id: I2c7333de680cf5d350894f5064e955969e804781
9 years ago
Paul Crowley
34b813eae6
Simplify test for right argc in cryptfs commands, and test more.
...
Change-Id: I23bb19a329b34ba4b81c57b815a2a0a4e8f27745
9 years ago
Paul Crowley
27cbce9214
Rename functions with a system/extras name collision.
...
Following around the call graph in code search is hard enough as it is!
Change-Id: I09d3513664423aafe0d99f9158acfbbb6c79b590
9 years ago
Paul Lawrence
ff9097f560
Fix create_user_key to take 3 params
...
Change-Id: Ied03e2ee404a1b4f386740213e6ab01f18ec09b9
9 years ago
Daichi Hirono
8575a350ff
Send file descriptor of /dev/fuse from vold.
...
BUG=25755834
Change-Id: Ica8bd336baa74e117be008a6e7ee34e3ffac3769
9 years ago
Lenka Trochtova
395039f007
Introduce support for ephemeral users.
...
BUG: 24883058
Change-Id: I77d4757f87214166e7c41c7eb0d06b1cd5f06b20
9 years ago
Jeff Sharkey
fc505c3ff6
Emulate media encryption, always chmod to unlock.
...
When FBE emulation is enabled, lock/unlock the media directories that
store emulated SD card contents.
Change unlocking logic to always chmod directories back to known
state so that we can recover devices that have disabled FBE
emulation.
Bug: 26010607, 26027473
Change-Id: I6d4bff25d8ad7b948679290106f585f777f7a249
9 years ago
Elliott Hughes
6bf0547ccc
resolve merge conflicts of b7d5a47cec
to master.
...
Change-Id: I0c5211a00d92d0ee796bb9c77d2e13675a2a3e8d
9 years ago
Elliott Hughes
b7d5a47cec
Merge "Track rename from base/ to android-base/." am: 20a8fa98f6
...
am: a9d5080109
* commit 'a9d5080109623884c8f8e7c3515eaa9ed3f85c58':
Track rename from base/ to android-base/.
9 years ago
Elliott Hughes
a9d5080109
Merge "Track rename from base/ to android-base/."
...
am: 20a8fa98f6
* commit '20a8fa98f6b858999b623272a182843259e1044c':
Track rename from base/ to android-base/.
9 years ago
Elliott Hughes
20a8fa98f6
Merge "Track rename from base/ to android-base/."
9 years ago
Jeff Sharkey
51c6b9876a
Merge "Handle non-format partition in Vold" am: 385ca5d236
am: 63b7774894
...
am: 971ecb40ee
* commit '971ecb40ee9bc3c729091667b5192dbae996c1d2':
Handle non-format partition in Vold
9 years ago
Jeff Sharkey
90cca664e1
Merge "Make sure path is not NULL to avoid fatal exception." am: e0e5bfeb3c
am: de629f105e
...
am: 9e807ea6db
* commit '9e807ea6db2c3ea7203844cefb31b1afa06619c3':
Make sure path is not NULL to avoid fatal exception.
9 years ago
Jeff Sharkey
20826a1574
Merge "vold: fix 64 bit ioctl error" am: 3e6c59dc16
am: bf6acf44a9
...
am: a619c191cc
* commit 'a619c191cc06c08fb19e1bdd486a41da65f6c0af':
vold: fix 64 bit ioctl error
9 years ago
Elliott Hughes
7e128fbe21
Track rename from base/ to android-base/.
...
Change-Id: I3096cfa50afa395d8e9a8043ab69c1e390f86ccb
9 years ago
Jeff Sharkey
971ecb40ee
Merge "Handle non-format partition in Vold" am: 385ca5d236
...
am: 63b7774894
* commit '63b77748946dc1c18c758d9094e8b735de5ef249':
Handle non-format partition in Vold
9 years ago
Jeff Sharkey
9e807ea6db
Merge "Make sure path is not NULL to avoid fatal exception." am: e0e5bfeb3c
...
am: de629f105e
* commit 'de629f105e12122ba042a8ae86b2130ef9a608bb':
Make sure path is not NULL to avoid fatal exception.
9 years ago
Jeff Sharkey
63b7774894
Merge "Handle non-format partition in Vold"
...
am: 385ca5d236
* commit '385ca5d236547a767133abcd44dff12ca7b805be':
Handle non-format partition in Vold
9 years ago
Jeff Sharkey
de629f105e
Merge "Make sure path is not NULL to avoid fatal exception."
...
am: e0e5bfeb3c
* commit 'e0e5bfeb3c49419ceb53d2ea2b7410ddcfab35c5':
Make sure path is not NULL to avoid fatal exception.
9 years ago
Jeff Sharkey
385ca5d236
Merge "Handle non-format partition in Vold"
9 years ago
Jeff Sharkey
e0e5bfeb3c
Merge "Make sure path is not NULL to avoid fatal exception."
9 years ago
Jeff Sharkey
a619c191cc
Merge "vold: fix 64 bit ioctl error" am: 3e6c59dc16
...
am: bf6acf44a9
* commit 'bf6acf44a9ac1754ec5089ec8370537ff37e5af3':
vold: fix 64 bit ioctl error
9 years ago
Jeff Sharkey
bf6acf44a9
Merge "vold: fix 64 bit ioctl error"
...
am: 3e6c59dc16
* commit '3e6c59dc162ff6b16177e480fdb80c08f24b3700':
vold: fix 64 bit ioctl error
9 years ago
Jeff Sharkey
3e6c59dc16
Merge "vold: fix 64 bit ioctl error"
9 years ago
Jeff Sharkey
a597d0a424
Use the right system property name.
...
Bug: 22358539
Change-Id: I0bf9719a2b54acbde80f3c911988724581447b0c
9 years ago
Paul Lawrence
3d99ebad3d
Encrypt on reboot
...
Change encryption to happen after a reboot, not before. This
removes the problem whereby if data cannot be unmounted, we cannot
encrypt.
Bug: 25426629
Change-Id: I25d610204234ed8254330d001eb965e6e87a2fe9
9 years ago
Jeff Sharkey
c79fb89a10
Switch to new FBE emulation property.
...
Also prepare CE/DE storage directories for owner user at boot.
Bug: 22358539
Change-Id: I76228952c990ebed83360c69ef36321b99114196
9 years ago
Jeff Sharkey
c74ce36359
Merge "Create user_de on adopted storage devices."
9 years ago
Jeff Sharkey
d322c2a23b
Create user_de on adopted storage devices.
...
Bug: 25676430
Change-Id: I22064789a608f13af2dddf740769969d4e4dcbe7
9 years ago
Paul Crowley
28c4df4bdc
Make deletion of larger files possible.
...
Bug: 22502684
Change-Id: I9034af1ce919bff51f836e5bf51cc2585089440e
9 years ago
Paul Crowley
5512c50c09
Merge "Add --no-unlink option to secdiscard for testing."
9 years ago
Paul Crowley
0f442b9c88
Merge "secdiscard.cpp: Use getmntent and my newfound C++ knowledge."
9 years ago
Jeff Sharkey
d2c96e7883
New granular encryption commands for framework.
...
We now have separate methods for key creation/destruction and
unlocking/locking. Key unlocking can pass through an opaque token,
but it's left empty for now.
Extend user storage setup to also create system_ce and user_de
paths. Bring over some path generation logic from installd.
Use strong type checking on user arguments.
Bug: 22358539
Change-Id: I00ba15c7b10dd682640b3f082feade4fb7cbbb5d
9 years ago
Kenny Root
873da23cb0
Merge "system/vold: check return value of PKCS5_PBKDF2_HMAC_SHA1." am: 0a7e668ebf
am: cd6d8e3fb6
...
am: 03b10c268b
* commit '03b10c268b810c06e31f20fab00ee9bb93d09d01':
system/vold: check return value of PKCS5_PBKDF2_HMAC_SHA1.
9 years ago
Kenny Root
03b10c268b
Merge "system/vold: check return value of PKCS5_PBKDF2_HMAC_SHA1." am: 0a7e668ebf
...
am: cd6d8e3fb6
* commit 'cd6d8e3fb68d09122acf4272ad0f93b0f253523f':
system/vold: check return value of PKCS5_PBKDF2_HMAC_SHA1.
9 years ago
Kenny Root
cd6d8e3fb6
Merge "system/vold: check return value of PKCS5_PBKDF2_HMAC_SHA1."
...
am: 0a7e668ebf
* commit '0a7e668ebf7215fbb89837e251f3f73a124adada':
system/vold: check return value of PKCS5_PBKDF2_HMAC_SHA1.
9 years ago
Kenny Root
0a7e668ebf
Merge "system/vold: check return value of PKCS5_PBKDF2_HMAC_SHA1."
9 years ago
Adam Langley
bf0d972ab4
system/vold: check return value of PKCS5_PBKDF2_HMAC_SHA1.
...
The function PKCS5_PBKDF2_HMAC_SHA1 can fail for a number of reasons and
thus its return value should be checked and handled.
Change-Id: I0f0d8f74b58940a34df16b88434a085760822075
9 years ago
Paul Lawrence
0c24746627
Add developer option to convert from FDE to FBE
...
This set of changes adds the screen that offers this conversion,
and the plumbing so the option is only available on suitable
devices.
It does not implement the conversion mechanism.
Change-Id: I801199c37b03436045d40bf8840a8746daf94d27
9 years ago
Bill Yi
ee9525609e
Merge commit \'aebfa6e7eee173b8e02f869c3a25cfe2a5fffb9b\' into HEAD am: abcf4c6fca
...
am: ec34abe030
* commit 'ec34abe0306b47640298110c8358c839b2c4432d':
9 years ago
Bill Yi
ec34abe030
Merge commit \'aebfa6e7eee173b8e02f869c3a25cfe2a5fffb9b\' into HEAD
...
am: abcf4c6fca
* commit 'abcf4c6fca01c92cd8b4dd581488ede684efea71':
9 years ago
Bill Yi
abcf4c6fca
Merge commit 'aebfa6e7eee173b8e02f869c3a25cfe2a5fffb9b' into HEAD
9 years ago
Paul Crowley
5ab73e945d
Add --no-unlink option to secdiscard for testing.
...
Also allow deletion of multiple files in one invocation.
Change-Id: I5011bf45f2d3b91964bc68fd8e61ec037e1de2ca
9 years ago
Paul Crowley
4432e73494
secdiscard.cpp: Use getmntent and my newfound C++ knowledge.
...
Bug: 19706593
Change-Id: I6254e0339ab42fdbecda80c6f37e64c323329190
9 years ago
Elliott Hughes
46c7b09e39
Merge "Fix ioctl parameter" am: 0eaad8ce8c
am: 5cd32f73d8
...
am: 8185d3d8ba
* commit '8185d3d8ba3dec0f26ade8cd4764d5f09cc00bcc':
Fix ioctl parameter
9 years ago
Elliott Hughes
8185d3d8ba
Merge "Fix ioctl parameter" am: 0eaad8ce8c
...
am: 5cd32f73d8
* commit '5cd32f73d8b5e6db60d397d102e5b1b193a76c77':
Fix ioctl parameter
9 years ago
Elliott Hughes
5cd32f73d8
Merge "Fix ioctl parameter"
...
am: 0eaad8ce8c
* commit '0eaad8ce8ceaa4b730b0be8c149f389647fbdab0':
Fix ioctl parameter
9 years ago
Elliott Hughes
0eaad8ce8c
Merge "Fix ioctl parameter"
9 years ago
caozhiyuan
9102b0b175
Fix ioctl parameter
...
Change-Id: I922c8ae77056db81bc5152346299a07a34c527d2
9 years ago