Qin Chao
e0074f142b
Hide external storage from apps if it's not set as adoptable
...
If storage is not visible to apps and no need to spin up FUSE, it also
should not make FUSE mount point directory.
Change-Id: I6ecd2e5bf56b5dcf0e11834880256b156a62a9a0
Signed-off-by: Qin Chao <chao.qin@intel.com>
2015-12-15 15:20:41 +08:00
Elliott Hughes
a9d5080109
Merge "Track rename from base/ to android-base/."
...
am: 20a8fa98f6
2015-12-04 17:39:41 -08:00
Elliott Hughes
20a8fa98f6
Merge "Track rename from base/ to android-base/."
2015-12-05 01:34:17 +00:00
Elliott Hughes
7e128fbe21
Track rename from base/ to android-base/.
...
Change-Id: I3096cfa50afa395d8e9a8043ab69c1e390f86ccb
2015-12-04 15:50:53 -08:00
Jeff Sharkey
63b7774894
Merge "Handle non-format partition in Vold"
...
am: 385ca5d236
2015-12-03 17:43:17 +00:00
Jeff Sharkey
de629f105e
Merge "Make sure path is not NULL to avoid fatal exception."
...
am: e0e5bfeb3c
2015-12-03 17:43:14 +00:00
Jeff Sharkey
385ca5d236
Merge "Handle non-format partition in Vold"
2015-12-03 17:40:21 +00:00
Jeff Sharkey
e0e5bfeb3c
Merge "Make sure path is not NULL to avoid fatal exception."
2015-12-03 17:39:39 +00:00
Jeff Sharkey
bf6acf44a9
Merge "vold: fix 64 bit ioctl error"
...
am: 3e6c59dc16
2015-12-03 16:57:37 +00:00
Jeff Sharkey
3e6c59dc16
Merge "vold: fix 64 bit ioctl error"
2015-12-03 16:56:13 +00:00
Kenny Root
cd6d8e3fb6
Merge "system/vold: check return value of PKCS5_PBKDF2_HMAC_SHA1."
...
am: 0a7e668ebf
2015-11-06 17:22:59 +00:00
Kenny Root
0a7e668ebf
Merge "system/vold: check return value of PKCS5_PBKDF2_HMAC_SHA1."
2015-11-06 17:20:30 +00:00
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
2015-11-04 14:51:39 -08:00
Bill Yi
abcf4c6fca
Merge commit 'aebfa6e7eee173b8e02f869c3a25cfe2a5fffb9b' into HEAD
2015-11-03 14:30:42 -08:00
Elliott Hughes
5cd32f73d8
Merge "Fix ioctl parameter"
...
am: 0eaad8ce8c
2015-10-29 20:41:28 +00:00
Elliott Hughes
0eaad8ce8c
Merge "Fix ioctl parameter"
2015-10-29 20:38:10 +00:00
caozhiyuan
9102b0b175
Fix ioctl parameter
...
Change-Id: I922c8ae77056db81bc5152346299a07a34c527d2
2015-10-29 08:48:20 +00:00
Oleksiy Avramchenko
aebfa6e7ee
Promote free bytes calculation to 64 bits
...
am: 2403b4d056
2015-10-21 23:24:03 +00:00
Jeff Sharkey
71ac649c1d
Kill apps using storage through bind mounts.
...
am: 89f74fbf25
2015-10-21 23:08:56 +00:00
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
2015-10-21 16:01:29 -07:00
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
2015-10-21 15:05:49 -07:00
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
2015-10-21 09:28:39 -07:00
Jeff Sharkey
0130fc6cfb
Merge "Promote free bytes calculation to 64 bits" am: 7d17af08a8
...
am: d3c7060ba5
2015-10-21 16:03:06 +00:00
Jeff Sharkey
d3c7060ba5
Merge "Promote free bytes calculation to 64 bits"
...
am: 7d17af08a8
2015-10-21 15:58:40 +00:00
Jeff Sharkey
7d17af08a8
Merge "Promote free bytes calculation to 64 bits"
2015-10-21 15:44:36 +00:00
Paul Lawrence
01a856d5ca
Merge "Don\'t show UI on default encryption" into mnc-dr-dev
...
am: 2309f76d17
2015-10-21 15:03:10 +00:00
Paul Lawrence
2309f76d17
Merge "Don't show UI on default encryption" into mnc-dr-dev
2015-10-21 14:27:30 +00:00
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>
2015-10-21 11:16:19 +08:00
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>
2015-10-21 11:15:39 +08:00
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>
2015-10-21 11:14:47 +08:00
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.
2015-10-12 16:48:57 +00:00
Jeff Sharkey
cb42a40a87
Merge "Clean up any/all stale partition tables." into mnc-dr-dev
2015-10-12 16:34:09 +00:00
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
2015-10-07 13:13:38 +02:00
Sami Tolvanen
f0500a0823
am 0331d4ae: am 685dfdd3: Merge "Error correction: Add libfec dependencies for vold"
...
* commit '0331d4ae3843f682e98bfa1aba0f8da7fbd9beb0':
Error correction: Add libfec dependencies for vold
2015-10-02 10:55:10 +00:00
Sami Tolvanen
0331d4ae38
am 685dfdd3: Merge "Error correction: Add libfec dependencies for vold"
...
* commit '685dfdd33590ef8a93627015c434fea54b8f1b4d':
Error correction: Add libfec dependencies for vold
2015-10-02 10:47:23 +00:00
Sami Tolvanen
685dfdd335
Merge "Error correction: Add libfec dependencies for vold"
2015-10-02 10:42:16 +00:00
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
2015-10-02 08:27:19 +00:00
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
2015-10-01 11:45:22 +01:00
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
2015-09-29 14:55:35 +01:00
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
2015-09-23 14:14:12 -07:00
Jeff Sharkey
1690c1bca2
am 1a20a648: Enable benchmark after trim, when requested.
...
* commit '1a20a6487faad2869eaec962e4373402aa7461b3':
Enable benchmark after trim, when requested.
2015-09-10 00:44:21 +00:00
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
2015-09-09 14:55:45 -07:00
Paul Lawrence
569649ff1d
Don't show UI on default encryption
...
Bug: 22989588
Change-Id: I21403233d84031869d929c46c3c7b2ebefb3caff
2015-09-09 12:13:00 -07:00
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.
2015-09-03 06:21:41 +00:00
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
2015-08-27 11:17:54 +00:00
Tom Cherry
efbaf0de36
am 685439bb: (-s ours) am 218f48d6: Merge "bundle init.rc contents with its service"
...
* commit '685439bbc7ef958a3472465ebdabf2b997889e76':
2015-08-27 11:17:53 +00:00
Elliott Hughes
debb3f8cba
am b1259ffd: (-s ours) am f298f6be: Merge "Use errno correctly."
...
* commit 'b1259ffd92f8965521f3f934548936dfd7650262':
2015-08-27 11:17:53 +00:00
Elliott Hughes
d9aea039e8
am 3097d0e1: (-s ours) am 6d24e086: Merge "Remove dead code."
...
* commit '3097d0e151b4f07552e987ee5819e9e7c6953a71':
2015-08-27 11:17:52 +00:00
Jeff Sharkey
88fbc74295
am 7206b42b: (-s ours) am eddf9bd6: Request specific tags from blkid.
...
* commit '7206b42badd044e3fcc75c1e1e842bf6d5475867':
2015-08-27 11:17:51 +00:00
Jeff Sharkey
fce8034b3e
am 2b8f194f: (-s ours) am 1bd078fa: Protect runtime storage mount points.
...
* commit '2b8f194f1a3c4929e7921a3cb31defd98579e87c':
2015-08-27 11:17:51 +00:00
