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
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
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
aebfa6e7ee
Promote free bytes calculation to 64 bits
...
am: 2403b4d056
* commit '2403b4d0561c756ed5102aaf6048a80c9993f6f8':
Promote free bytes calculation to 64 bits
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
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
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
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
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
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
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
David Ng
82fd804f8b
vold: Retry opening block device on failure when starting encryption
...
The device mapper storage device node can take some time to be
created; so retry.
Bug: 23024596
Change-Id: Ieeb3b697f9cef72d4ea9d106750696901f0a224d
9 years ago
Sami Tolvanen
efe67cd25d
Error correction: Add libfec dependencies for vold
...
Vold requires libfec and related dependencies due to fs_mgr_mount_all.
Bug: 21893453
Change-Id: If59df0c5fd3395d4aac97dd8119b7c70c0fa5d4d
9 years ago
Jeff Sharkey
dadcceea7a
Clean up any/all stale partition tables.
...
When formatting media as a public volume, we write an MBR, but we
might leave a stale GPT floating around. Some devices are configured
to aggressively prefer GPT when detected, even if the checksums
between primary/secondary don't match.
To work around this, nuke both MBR and GPT tables from the media
before we lay down our new MBR.
Bug: 24112219
Change-Id: Ibf1be466a6877cbab925a24db5e5dbab0613bea7
9 years ago
Jeff Sharkey
1690c1bca2
am 1a20a648: Enable benchmark after trim, when requested.
...
* commit '1a20a6487faad2869eaec962e4373402aa7461b3':
Enable benchmark after trim, when requested.
9 years ago
Jeff Sharkey
1a20a6487f
Enable benchmark after trim, when requested.
...
The framework can request that a benchmark be run after an fstrim,
but it was disabled due to a kernel bug on certain devices. That bug
has long been fixed, so it should be safe to enable this again.
Bug: 23942769
Change-Id: Ibe967a75856d0cbad45e2f8f3120f1970caf36d0
9 years ago
Paul Lawrence
569649ff1d
Don't show UI on default encryption
...
Bug: 22989588
Change-Id: I21403233d84031869d929c46c3c7b2ebefb3caff
9 years ago
Paul Crowley
2ada951768
am 480fcd27: Set uid/gid of newly created user dirs to system/system.
...
* commit '480fcd2750c1d30f3397d1f3152519a11f60990b':
Set uid/gid of newly created user dirs to system/system.
9 years ago
Tom Cherry
fa68681ac7
am 79b6fdfc: (-s ours) update bundled rc files to their contents from rootdir/init.rc
...
* commit '79b6fdfcea593b9f1a2422f1327a279ee77a54c2':
update bundled rc files to their contents from rootdir/init.rc
9 years ago
Tom Cherry
efbaf0de36
am 685439bb: (-s ours) am 218f48d6: Merge "bundle init.rc contents with its service"
...
* commit '685439bbc7ef958a3472465ebdabf2b997889e76':
9 years ago
Elliott Hughes
debb3f8cba
am b1259ffd: (-s ours) am f298f6be: Merge "Use errno correctly."
...
* commit 'b1259ffd92f8965521f3f934548936dfd7650262':
9 years ago
Elliott Hughes
d9aea039e8
am 3097d0e1: (-s ours) am 6d24e086: Merge "Remove dead code."
...
* commit '3097d0e151b4f07552e987ee5819e9e7c6953a71':
9 years ago
Jeff Sharkey
88fbc74295
am 7206b42b: (-s ours) am eddf9bd6: Request specific tags from blkid.
...
* commit '7206b42badd044e3fcc75c1e1e842bf6d5475867':
9 years ago
Jeff Sharkey
fce8034b3e
am 2b8f194f: (-s ours) am 1bd078fa: Protect runtime storage mount points.
...
* commit '2b8f194f1a3c4929e7921a3cb31defd98579e87c':
9 years ago
Jeff Sharkey
489fce1c85
am 3a60599a: (-s ours) am 8474ee32: Return useful path when not visible.
...
* commit '3a60599ae83aadc9eb2dcc5f645508100ede58f9':
9 years ago
Jeff Sharkey
c4ecb51750
am 26934b09: (-s ours) am d46687ee: Use random data for benchmark instead of zeros.
...
* commit '26934b0954f28d2d465097bf78f6be0139839b14':
9 years ago
Jeff Sharkey
e7556ee814
am 09b542f2: (-s ours) am 20642ae7: Give secondary users read-only physical cards.
...
* commit '09b542f269bfd0726de53c2d230c5266f5227f1c':
9 years ago
Jeff Sharkey
8a28676289
am 15c6489a: (-s ours) am 32679a82: Create user directory on emulated storage.
...
* commit '15c6489aa9de4a11f4ec25b69841fb1c936b6380':
9 years ago
Jeff Sharkey
287cc74d0e
am 0d3fe815: (-s ours) am 81f55c6d: Mount emulated volumes as consistent location.
...
* commit '0d3fe8152ef0e15bd4105013faaee7961e6a6ea9':
9 years ago
Paul Crowley
480fcd2750
Set uid/gid of newly created user dirs to system/system.
...
Bug: 23395513
Change-Id: I3d76b77339f995103c0aec09c6de77b3c8cdc0dd
9 years ago
Tom Cherry
205a874e86
update bundled rc files to their contents from rootdir/init.rc
...
Bug 23186545
Change-Id: I634b682b7a4cef9e1b817561b4458e1442443c63
(cherry picked from commit 6cb234dc57
)
9 years ago
Tom Cherry
79b6fdfcea
update bundled rc files to their contents from rootdir/init.rc
...
Bug 23186545
Change-Id: I634b682b7a4cef9e1b817561b4458e1442443c63
(cherry picked from commit 6cb234dc57
)
9 years ago
Tom Cherry
10b02df820
am 218f48d6: Merge "bundle init.rc contents with its service"
...
* commit '218f48d6c55a7ee5115a7a8fc4248d33ea01811f':
bundle init.rc contents with its service
9 years ago
Tom Cherry
685439bbc7
am 218f48d6: Merge "bundle init.rc contents with its service"
...
* commit '218f48d6c55a7ee5115a7a8fc4248d33ea01811f':
bundle init.rc contents with its service
9 years ago