Chih-Hung Hsieh
a4353671b1
Fix google-explicit-constructor warnings in system/vold.
...
Bug: 28341362
Change-Id: I14344b0cba134570bf87e7d61aa03503735dd794
Test: build with WITH_TIDY=1
2016-08-02 11:41:54 -07:00
Chih-hung Hsieh
e24d4eef9b
Merge "Fix clang-tidy performance warnings in system/vold."
2016-07-27 22:42:50 +00:00
Chih-Hung Hsieh
11a2ce8da3
Fix clang-tidy performance warnings in system/vold.
...
* Use const reference type for for-loop index variables
to avoid unnecessary copy.
Bug: 30413223
Change-Id: Id4d980ae8afec1374fc3be0b23f1c6a39bff86e0
Test: build with WITH_TIDY=1
2016-07-27 14:11:02 -07:00
Chih-hung Hsieh
786c536e84
Merge "Fix misc-macro-parentheses warnings in system/vold."
2016-06-22 21:21:16 +00:00
Chih-Hung Hsieh
aae793802b
Fix misc-macro-parentheses warnings in system/vold.
...
Add parentheses around macro arguments used beside operators.
Bug: 28705665
Change-Id: I44e954f15bf6b8279d0f857d5417b7cb457da779
2016-06-10 14:15:18 -07:00
Treehugger Robot
0c0f9228cf
Merge "Fix misc-macro-parentheses warnings."
2016-05-11 22:52:30 +00:00
Chih-Hung Hsieh
cc5d580858
Fix misc-macro-parentheses warnings.
...
Add parentheses around macro arguments used beside binary operators.
Bug: 28705665
Change-Id: I0731cb8b22b3a9bdadac6414473d90e8398a8e89
2016-05-11 15:05:05 -07:00
Elliott Hughes
af458c478a
Merge "Switch to BoringSSL crypto."
2016-04-12 23:12:35 +00:00
Dan Austin
a4f7dadd38
Merge "Address const issues in preparation for libcxx rebase."
2016-04-12 22:21:17 +00:00
Mattias Nissler
dc80323969
Switch to BoringSSL crypto.
...
This replaces the libmincrypt dependency with libcrypto_utils, which
is needed due to libfec and fs_mgr switching to BoringSSL.
Change-Id: I4f6f4d8cc5e200679331a9bcdf2cc3bad1082dd6
2016-04-06 15:54:11 +02:00
Dan Austin
49ab5f9e6d
Address const issues in preparation for libcxx rebase.
...
Change-Id: I5199c1eb4e874fd354beefa1232707949483e88d
2016-03-28 13:24:48 -07:00
Bill Yi
e7af39dc4b
Merge commit '9b5db9bcbe333b677ca18d2c1c398c8751cd0fd2' into HEAD
2016-02-17 09:51:20 -08:00
Dimitry Ivanov
6e8a931d54
Merge "Add missing liblog dependency"
2016-02-13 00:37:27 +00:00
Dimitry Ivanov
01f86a521d
Add missing liblog dependency
...
Bug: http://b/27171986
Change-Id: I03c5f9375ca46a81250ac00493a4f3f1eebf3156
2016-02-12 16:10:22 -08:00
Jeffrey Vander Stoep
6f69ee094c
Merge "cryptfs: run e2fsck/fsck.f2fs in fsck domain"
2016-02-01 23:05:55 +00:00
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
2016-02-01 12:59:59 -08:00
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 .
2016-01-11 20:31:03 +00:00
Paul Lawrence
1ae498e0d4
Merge "cryptfs: Skip to encrtypt unused blocks into a block group which uninitialize block bitmap ."
2016-01-11 20:25:32 +00:00
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>
2016-01-06 15:20:38 +08:00
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
2015-12-16 23:10:38 +00:00
Jeff Sharkey
f570ded508
Merge "Hide external storage from apps if it's not set as adoptable"
2015-12-16 22:19:11 +00:00
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
b7d5a47cec
Merge "Track rename from base/ to android-base/." am: 20a8fa98f6
...
am: a9d5080109
* commit 'a9d5080109623884c8f8e7c3515eaa9ed3f85c58':
Track rename from base/ to android-base/.
2015-12-05 01:45:41 +00:00
Elliott Hughes
a9d5080109
Merge "Track rename from base/ to android-base/."
...
am: 20a8fa98f6
* commit '20a8fa98f6b858999b623272a182843259e1044c':
Track rename from base/ to android-base/.
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
971ecb40ee
Merge "Handle non-format partition in Vold" am: 385ca5d236
...
am: 63b7774894
* commit '63b77748946dc1c18c758d9094e8b735de5ef249':
Handle non-format partition in Vold
2015-12-03 17:46:23 +00:00
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.
2015-12-03 17:46:20 +00:00
Jeff Sharkey
63b7774894
Merge "Handle non-format partition in Vold"
...
am: 385ca5d236
* commit '385ca5d236547a767133abcd44dff12ca7b805be':
Handle non-format partition in Vold
2015-12-03 17:43:17 +00:00
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.
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
a619c191cc
Merge "vold: fix 64 bit ioctl error" am: 3e6c59dc16
...
am: bf6acf44a9
* commit 'bf6acf44a9ac1754ec5089ec8370537ff37e5af3':
vold: fix 64 bit ioctl error
2015-12-03 17:01:37 +00:00
Jeff Sharkey
bf6acf44a9
Merge "vold: fix 64 bit ioctl error"
...
am: 3e6c59dc16
* commit '3e6c59dc162ff6b16177e480fdb80c08f24b3700':
vold: fix 64 bit ioctl error
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
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.
2015-11-06 17:24:55 +00:00
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.
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
ec34abe030
Merge commit \'aebfa6e7eee173b8e02f869c3a25cfe2a5fffb9b\' into HEAD
...
am: abcf4c6fca
* commit 'abcf4c6fca01c92cd8b4dd581488ede684efea71':
2015-11-03 23:34:26 +00:00
Bill Yi
abcf4c6fca
Merge commit 'aebfa6e7eee173b8e02f869c3a25cfe2a5fffb9b' into HEAD
2015-11-03 14:30:42 -08:00
Elliott Hughes
8185d3d8ba
Merge "Fix ioctl parameter" am: 0eaad8ce8c
...
am: 5cd32f73d8
* commit '5cd32f73d8b5e6db60d397d102e5b1b193a76c77':
Fix ioctl parameter
2015-10-29 20:44:35 +00:00
Elliott Hughes
5cd32f73d8
Merge "Fix ioctl parameter"
...
am: 0eaad8ce8c
* commit '0eaad8ce8ceaa4b730b0be8c149f389647fbdab0':
Fix ioctl parameter
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
* commit '2403b4d0561c756ed5102aaf6048a80c9993f6f8':
Promote free bytes calculation to 64 bits
2015-10-21 23:24:03 +00:00
Jeff Sharkey
71ac649c1d
Kill apps using storage through bind mounts.
...
am: 89f74fbf25
* commit '89f74fbf2529d708534c041d2b711af0f1feff9f':
Kill apps using storage through bind mounts.
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