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
Oleksiy Avramchenko
da44c06320
Promote free bytes calculation to 64 bits am: 2403b4d056
...
am: aebfa6e7ee
* commit 'aebfa6e7eee173b8e02f869c3a25cfe2a5fffb9b':
Promote free bytes calculation to 64 bits
9 years ago
Oleksiy Avramchenko
aebfa6e7ee
Promote free bytes calculation to 64 bits
...
am: 2403b4d056
* commit '2403b4d0561c756ed5102aaf6048a80c9993f6f8':
Promote free bytes calculation to 64 bits
9 years ago
Jeff Sharkey
8643c83d8d
Kill apps using storage through bind mounts. am: 89f74fbf25
...
am: 71ac649c1d
* commit '71ac649c1d179a8d97db6fd1862f8b0d992a6751':
Kill apps using storage through bind mounts.
9 years ago
Jeff Sharkey
71ac649c1d
Kill apps using storage through bind mounts.
...
am: 89f74fbf25
* commit '89f74fbf2529d708534c041d2b711af0f1feff9f':
Kill apps using storage through bind mounts.
9 years ago
Oleksiy Avramchenko
2403b4d056
Promote free bytes calculation to 64 bits
...
The expression otherwise overflows for large devices.
It's fsblkcnt_t -> unsigned long, which is 32 bit on ARMv7.
Bug: 25162062
Change-Id: I46c5e00558b7dbd6abd50fae4727396079044df2
9 years ago
Jeff Sharkey
89f74fbf25
Kill apps using storage through bind mounts.
...
When unmounting an emulated volume, look for apps with open files
using the final published volume path.
Without this change, we were only looking at the internal paths
used for runtime permissions, which apps never use directly. This
meant we'd always fail to unmount the volume if apps didn't respect
the EJECTING broadcast, and volume migration would end up wedged
until the device rebooted.
Bug: 24863778
Change-Id: Ibda484e66ab95744c304c344b226caa5b10b7e2e
9 years ago
Paul Lawrence
6169737bbd
Don\'t show UI on default encryption
...
am: 6ae8604c10
* commit '6ae8604c1006e6ba0f687680387062d4acf1e41b':
Don't show UI on default encryption
9 years ago
Paul Lawrence
6ae8604c10
Don't show UI on default encryption
...
Merge of https://googleplex-android-review.git.corp.google.com/#/c/764976
Bug: 22989588
Change-Id: I3a6b01ee80446e0955e2039f88a627d37ee6caef
9 years ago
Jeff Sharkey
18f44aa6ae
Merge "Promote free bytes calculation to 64 bits" am: 7d17af08a8
am: d3c7060ba5
...
am: 0130fc6cfb
* commit '0130fc6cfb77c4a835e7df2f48fc47fdd1a9855a':
Promote free bytes calculation to 64 bits
9 years ago
Jeff Sharkey
0130fc6cfb
Merge "Promote free bytes calculation to 64 bits" am: 7d17af08a8
...
am: d3c7060ba5
* commit 'd3c7060ba53d87c58103b1776815fea9d29e39cc':
Promote free bytes calculation to 64 bits
9 years ago
Jeff Sharkey
d3c7060ba5
Merge "Promote free bytes calculation to 64 bits"
...
am: 7d17af08a8
* commit '7d17af08a80c3d9a14a3fe11d70bd12d59641a7b':
Promote free bytes calculation to 64 bits
9 years ago
Jeff Sharkey
7d17af08a8
Merge "Promote free bytes calculation to 64 bits"
9 years ago
Paul Lawrence
a004e4f8f2
Merge "Don\'t show UI on default encryption" into mnc-dr-dev am: 2309f76d17
...
am: 01a856d5ca
* commit '01a856d5ca99d2c51382de57c02c053d3de88c7d':
Don't show UI on default encryption
9 years ago
Paul Lawrence
01a856d5ca
Merge "Don\'t show UI on default encryption" into mnc-dr-dev
...
am: 2309f76d17
* commit '2309f76d17171a4e9b2593ff248861eb3a41ec5a':
Don't show UI on default encryption
9 years ago
Paul Lawrence
2309f76d17
Merge "Don't show UI on default encryption" into mnc-dr-dev
9 years ago
Mateusz Nowak
a4f48d0f44
vold: fix 64 bit ioctl error
...
Changing the num_sectors used in ioctl with BLKGETSIZE because
the kernel expects an unsigned long type and then changes 64 bits
with a 64 bits userspace. This overwrites what's located close to
the parameter location if any.
Change-Id: I78fd61a1084de2741f39b926aa436462518709a0
Signed-off-by: Mateusz Nowak <mateusz.nowak@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
9 years ago
Mateusz Nowak
6440379f1b
Make sure path is not NULL to avoid fatal exception.
...
Change-Id: I75fd5d90cf0f75c28e75582fcae934afa4bf29c4
Signed-off-by: Mateusz Nowak <mateusz.nowak@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
9 years ago
Mateusz Nowak
3dd39309d0
Handle non-format partition in Vold
...
fsck_msdos will retun error code 8 when the partition is non-format.
Handle this error code and continue next partition in Vold.
Change-Id: I31499ccb16945ffbc67bdc92dfbc3ea71e82573a
Signed-off-by: Mateusz Nowak <mateusz.nowak@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
9 years ago
Jeff Sharkey
1790fe66e7
am f6852593: am cb42a40a: Merge "Clean up any/all stale partition tables." into mnc-dr-dev
...
* commit 'f68525931e1b9ab6938d87bb95a2fa7966f046c4':
Clean up any/all stale partition tables.
9 years ago
Jeff Sharkey
f68525931e
am cb42a40a: Merge "Clean up any/all stale partition tables." into mnc-dr-dev
...
* commit 'cb42a40a871bc8f06f0a37d321dbe2e7693da0e5':
Clean up any/all stale partition tables.
9 years ago
Jeff Sharkey
cb42a40a87
Merge "Clean up any/all stale partition tables." into mnc-dr-dev
9 years ago
Oleksiy Avramchenko
e76cf536a4
Promote free bytes calculation to 64 bits
...
The expression otherwise overflows for large devices.
It's fsblkcnt_t -> unsigned long, which is 32 bit on ARMv7.
Change-Id: I46c5e00558b7dbd6abd50fae4727396079044df2
9 years ago
Sami Tolvanen
aeca741ce6
am f0500a08: am 0331d4ae: am 685dfdd3: Merge "Error correction: Add libfec dependencies for vold"
...
* commit 'f0500a08230f068a1cf55e4de3cfc389d51f8669':
Error correction: Add libfec dependencies for vold
9 years ago
Sami Tolvanen
f0500a0823
am 0331d4ae: am 685dfdd3: Merge "Error correction: Add libfec dependencies for vold"
...
* commit '0331d4ae3843f682e98bfa1aba0f8da7fbd9beb0':
Error correction: Add libfec dependencies for vold
9 years ago
Sami Tolvanen
0331d4ae38
am 685dfdd3: Merge "Error correction: Add libfec dependencies for vold"
...
* commit '685dfdd33590ef8a93627015c434fea54b8f1b4d':
Error correction: Add libfec dependencies for vold
9 years ago
Sami Tolvanen
685dfdd335
Merge "Error correction: Add libfec dependencies for vold"
9 years ago
David Ng
dfe3d869a5
am 44710f0f: am 82fd804f: vold: Retry opening block device on failure when starting encryption
...
* commit '44710f0f9c868f999aecb91a8d3cd8bf9536b283':
vold: Retry opening block device on failure when starting encryption
9 years ago
David Ng
44710f0f9c
am 82fd804f: vold: Retry opening block device on failure when starting encryption
...
* commit '82fd804f8ba49399f425bf43681b9b7fe464d9a1':
vold: Retry opening block device on failure when starting encryption
9 years ago