Bill Yi
e7af39dc4b
Merge commit '9b5db9bcbe333b677ca18d2c1c398c8751cd0fd2' into HEAD
9 years ago
Dimitry Ivanov
6e8a931d54
Merge "Add missing liblog dependency"
9 years ago
Dimitry Ivanov
01f86a521d
Add missing liblog dependency
...
Bug: http://b/27171986
Change-Id: I03c5f9375ca46a81250ac00493a4f3f1eebf3156
9 years ago
Jeffrey Vander Stoep
6f69ee094c
Merge "cryptfs: run e2fsck/fsck.f2fs in fsck domain"
9 years ago
Jeff Vander Stoep
df72575862
cryptfs: run e2fsck/fsck.f2fs in fsck domain
...
e2fsck and fsck.f2fs must run in the fsck domain. Add call to
setexeccon() to tell selinux to run in the fsck domain on exec.
Addresses:
avc: denied { execute_no_trans } for path="/system/bin/e2fsck" dev="mmcblk0p41" ino=241 scontext=u:r:vold:s0 tcontext=u:object_r:fsck_exec:s0 tclass=file
Bug: 26872236
Change-Id: Ib2a583aeefc667f8aa67532e0ac0ff9619b65461
9 years ago
Paul Lawrence
9b5db9bcbe
Merge "cryptfs: Skip to encrtypt unused blocks into a block group which uninitialize block bitmap ."
...
am: 1ae498e0d4
* commit '1ae498e0d4524aef6de2f1e3b639697ac24b29b2':
cryptfs: Skip to encrtypt unused blocks into a block group which uninitialize block bitmap .
9 years ago
Paul Lawrence
1ae498e0d4
Merge "cryptfs: Skip to encrtypt unused blocks into a block group which uninitialize block bitmap ."
9 years ago
liminghao
aa08e58e3a
cryptfs: Skip to encrtypt unused blocks into a block group which uninitialize block bitmap .
...
Bug: 198288
Change-Id: Iaa1a14fd916ddec8dc1a4be18d49732ebcba6884
Signed-off-by: liminghao <liminghao@xiaomi.com>
9 years ago
Jeff Sharkey
6a7d34bffd
Merge "Hide external storage from apps if it\'s not set as adoptable"
...
am: f570ded508
* commit 'f570ded508aacc8130a2fd8f1130a51991202d9d':
Hide external storage from apps if it's not set as adoptable
9 years ago
Jeff Sharkey
f570ded508
Merge "Hide external storage from apps if it's not set as adoptable"
9 years ago
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>
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
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
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
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
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