OSDN Git Service

android-x86/system-vold.git
8 years agoUse android-base logging not cutils in secdiscard
Paul Crowley [Mon, 11 Jan 2016 12:26:44 +0000 (12:26 +0000)]
Use android-base logging not cutils in secdiscard

Much nicer C++ style logging, but the main reason is to clean up
AutoCloseFD.h so I don't have to use cutils to use it.

Change-Id: I7a7f227508418046eecce6c89f813bd8854f448a

8 years agoAdd unmount command to vold's AppFuse listener.
Daichi Hirono [Wed, 16 Dec 2015 04:04:37 +0000 (13:04 +0900)]
Add unmount command to vold's AppFuse listener.

BUG=25756420

Change-Id: I75b41f135c172d400e57a72a2be0473546781475

8 years agoCreate /data/media directory for new users.
Jeff Sharkey [Sat, 19 Dec 2015 00:18:22 +0000 (17:18 -0700)]
Create /data/media directory for new users.

Otherwise later unlock commands will fail.

Bug: 26267450
Change-Id: I090ac3a3fd4ac6d49290906e21d88f1efcdec421

8 years agoMerge "Hide external storage from apps if it\'s not set as adoptable" am: f570ded508
Jeff Sharkey [Thu, 17 Dec 2015 07:47:40 +0000 (07:47 +0000)]
Merge "Hide external storage from apps if it\'s not set as adoptable" am: f570ded508
am: 6a7d34bffd

* commit '6a7d34bffdcd166bfc8fafe98b00dd5063e50667':
  Hide external storage from apps if it's not set as adoptable

8 years agoMerge "Hide external storage from apps if it\'s not set as adoptable"
Jeff Sharkey [Wed, 16 Dec 2015 23:10:38 +0000 (23:10 +0000)]
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

8 years agoMerge "Hide external storage from apps if it's not set as adoptable"
Jeff Sharkey [Wed, 16 Dec 2015 22:19:11 +0000 (22:19 +0000)]
Merge "Hide external storage from apps if it's not set as adoptable"

8 years agoHide external storage from apps if it's not set as adoptable
Qin Chao [Tue, 15 Dec 2015 07:20:41 +0000 (15:20 +0800)]
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>
8 years agoAvoid use of a macro when checking argument count.
Paul Crowley [Mon, 14 Dec 2015 15:52:19 +0000 (15:52 +0000)]
Avoid use of a macro when checking argument count.

Change-Id: Ia697de58b983233c78e9ef8eb93098d50dfda931

8 years agoFix a bug in passing parameters to prepare_user_storage.
Lenka Trochtova [Fri, 11 Dec 2015 12:27:26 +0000 (13:27 +0100)]
Fix a bug in passing parameters to prepare_user_storage.

Add the serial parameter to prepare_user_storage to avoid
confusion when parsing parameters and passing them around.

Change-Id: Id5516c248401ad50585aa8f6e8b1545a6cded549

8 years agoMount FUSE for appfuse directories.
Daichi Hirono [Wed, 9 Dec 2015 05:37:05 +0000 (14:37 +0900)]
Mount FUSE for appfuse directories.

BUG=25755834

Change-Id: Icb59b5096239fd3611b614a0870d0ec910cee277

8 years agoMerge "Send file descriptor of /dev/fuse from vold."
Daichi Hirono [Fri, 11 Dec 2015 06:16:13 +0000 (06:16 +0000)]
Merge "Send file descriptor of /dev/fuse from vold."

8 years agoUse Jeff's C++ style for finding the subcommand consistently.
Paul Crowley [Thu, 10 Dec 2015 16:51:53 +0000 (16:51 +0000)]
Use Jeff's C++ style for finding the subcommand consistently.

Change-Id: I2c7333de680cf5d350894f5064e955969e804781

8 years agoSimplify test for right argc in cryptfs commands, and test more.
Paul Crowley [Thu, 10 Dec 2015 16:26:15 +0000 (16:26 +0000)]
Simplify test for right argc in cryptfs commands, and test more.

Change-Id: I23bb19a329b34ba4b81c57b815a2a0a4e8f27745

8 years agoRename functions with a system/extras name collision.
Paul Crowley [Thu, 10 Dec 2015 14:51:30 +0000 (14:51 +0000)]
Rename functions with a system/extras name collision.

Following around the call graph in code search is hard enough as it is!

Change-Id: I09d3513664423aafe0d99f9158acfbbb6c79b590

8 years agoFix create_user_key to take 3 params
Paul Lawrence [Wed, 9 Dec 2015 23:45:41 +0000 (15:45 -0800)]
Fix create_user_key to take 3 params

Change-Id: Ied03e2ee404a1b4f386740213e6ab01f18ec09b9

8 years agoSend file descriptor of /dev/fuse from vold.
Daichi Hirono [Mon, 7 Dec 2015 08:29:29 +0000 (17:29 +0900)]
Send file descriptor of /dev/fuse from vold.

BUG=25755834

Change-Id: Ica8bd336baa74e117be008a6e7ee34e3ffac3769

8 years agoIntroduce support for ephemeral users.
Lenka Trochtova [Wed, 25 Nov 2015 09:13:03 +0000 (10:13 +0100)]
Introduce support for ephemeral users.

BUG: 24883058

Change-Id: I77d4757f87214166e7c41c7eb0d06b1cd5f06b20

8 years agoEmulate media encryption, always chmod to unlock.
Jeff Sharkey [Tue, 8 Dec 2015 00:27:01 +0000 (17:27 -0700)]
Emulate media encryption, always chmod to unlock.

When FBE emulation is enabled, lock/unlock the media directories that
store emulated SD card contents.

Change unlocking logic to always chmod directories back to known
state so that we can recover devices that have disabled FBE
emulation.

Bug: 2601060726027473
Change-Id: I6d4bff25d8ad7b948679290106f585f777f7a249

8 years agoresolve merge conflicts of b7d5a47cec to master.
Elliott Hughes [Sat, 5 Dec 2015 01:55:33 +0000 (17:55 -0800)]
resolve merge conflicts of b7d5a47cec to master.

Change-Id: I0c5211a00d92d0ee796bb9c77d2e13675a2a3e8d

8 years agoMerge "Track rename from base/ to android-base/." am: 20a8fa98f6
Elliott Hughes [Sat, 5 Dec 2015 01:45:41 +0000 (01:45 +0000)]
Merge "Track rename from base/ to android-base/." am: 20a8fa98f6
am: a9d5080109

* commit 'a9d5080109623884c8f8e7c3515eaa9ed3f85c58':
  Track rename from base/ to android-base/.

8 years agoMerge "Track rename from base/ to android-base/."
Elliott Hughes [Sat, 5 Dec 2015 01:39:41 +0000 (17:39 -0800)]
Merge "Track rename from base/ to android-base/."
am: 20a8fa98f6

* commit '20a8fa98f6b858999b623272a182843259e1044c':
  Track rename from base/ to android-base/.

8 years agoMerge "Track rename from base/ to android-base/."
Elliott Hughes [Sat, 5 Dec 2015 01:34:17 +0000 (01:34 +0000)]
Merge "Track rename from base/ to android-base/."

8 years agoMerge "Handle non-format partition in Vold" am: 385ca5d236 am: 63b7774894
Jeff Sharkey [Sat, 5 Dec 2015 00:54:30 +0000 (00:54 +0000)]
Merge "Handle non-format partition in Vold" am: 385ca5d236 am: 63b7774894
am: 971ecb40ee

* commit '971ecb40ee9bc3c729091667b5192dbae996c1d2':
  Handle non-format partition in Vold

8 years agoMerge "Make sure path is not NULL to avoid fatal exception." am: e0e5bfeb3c am: de629...
Jeff Sharkey [Sat, 5 Dec 2015 00:54:27 +0000 (00:54 +0000)]
Merge "Make sure path is not NULL to avoid fatal exception." am: e0e5bfeb3c am: de629f105e
am: 9e807ea6db

* commit '9e807ea6db2c3ea7203844cefb31b1afa06619c3':
  Make sure path is not NULL to avoid fatal exception.

8 years agoMerge "vold: fix 64 bit ioctl error" am: 3e6c59dc16 am: bf6acf44a9
Jeff Sharkey [Sat, 5 Dec 2015 00:54:22 +0000 (00:54 +0000)]
Merge "vold: fix 64 bit ioctl error" am: 3e6c59dc16 am: bf6acf44a9
am: a619c191cc

* commit 'a619c191cc06c08fb19e1bdd486a41da65f6c0af':
  vold: fix 64 bit ioctl error

8 years agoTrack rename from base/ to android-base/.
Elliott Hughes [Fri, 4 Dec 2015 23:50:53 +0000 (15:50 -0800)]
Track rename from base/ to android-base/.

Change-Id: I3096cfa50afa395d8e9a8043ab69c1e390f86ccb

8 years agoMerge "Handle non-format partition in Vold" am: 385ca5d236
Jeff Sharkey [Thu, 3 Dec 2015 17:46:23 +0000 (17:46 +0000)]
Merge "Handle non-format partition in Vold" am: 385ca5d236
am: 63b7774894

* commit '63b77748946dc1c18c758d9094e8b735de5ef249':
  Handle non-format partition in Vold

8 years agoMerge "Make sure path is not NULL to avoid fatal exception." am: e0e5bfeb3c
Jeff Sharkey [Thu, 3 Dec 2015 17:46:20 +0000 (17:46 +0000)]
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.

8 years agoMerge "Handle non-format partition in Vold"
Jeff Sharkey [Thu, 3 Dec 2015 17:43:17 +0000 (17:43 +0000)]
Merge "Handle non-format partition in Vold"
am: 385ca5d236

* commit '385ca5d236547a767133abcd44dff12ca7b805be':
  Handle non-format partition in Vold

8 years agoMerge "Make sure path is not NULL to avoid fatal exception."
Jeff Sharkey [Thu, 3 Dec 2015 17:43:14 +0000 (17:43 +0000)]
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.

8 years agoMerge "Handle non-format partition in Vold"
Jeff Sharkey [Thu, 3 Dec 2015 17:40:21 +0000 (17:40 +0000)]
Merge "Handle non-format partition in Vold"

8 years agoMerge "Make sure path is not NULL to avoid fatal exception."
Jeff Sharkey [Thu, 3 Dec 2015 17:39:39 +0000 (17:39 +0000)]
Merge "Make sure path is not NULL to avoid fatal exception."

8 years agoMerge "vold: fix 64 bit ioctl error" am: 3e6c59dc16
Jeff Sharkey [Thu, 3 Dec 2015 17:01:37 +0000 (17:01 +0000)]
Merge "vold: fix 64 bit ioctl error" am: 3e6c59dc16
am: bf6acf44a9

* commit 'bf6acf44a9ac1754ec5089ec8370537ff37e5af3':
  vold: fix 64 bit ioctl error

8 years agoMerge "vold: fix 64 bit ioctl error"
Jeff Sharkey [Thu, 3 Dec 2015 16:57:37 +0000 (16:57 +0000)]
Merge "vold: fix 64 bit ioctl error"
am: 3e6c59dc16

* commit '3e6c59dc162ff6b16177e480fdb80c08f24b3700':
  vold: fix 64 bit ioctl error

8 years agoMerge "vold: fix 64 bit ioctl error"
Jeff Sharkey [Thu, 3 Dec 2015 16:56:13 +0000 (16:56 +0000)]
Merge "vold: fix 64 bit ioctl error"

8 years agoUse the right system property name.
Jeff Sharkey [Mon, 30 Nov 2015 20:28:56 +0000 (13:28 -0700)]
Use the right system property name.

Bug: 22358539
Change-Id: I0bf9719a2b54acbde80f3c911988724581447b0c

8 years agoEncrypt on reboot
Paul Lawrence [Fri, 20 Nov 2015 15:07:19 +0000 (07:07 -0800)]
Encrypt on reboot

Change encryption to happen after a reboot, not before. This
removes the problem whereby if data cannot be unmounted, we cannot
encrypt.

Bug: 25426629

Change-Id: I25d610204234ed8254330d001eb965e6e87a2fe9

8 years agoSwitch to new FBE emulation property.
Jeff Sharkey [Fri, 13 Nov 2015 04:18:02 +0000 (20:18 -0800)]
Switch to new FBE emulation property.

Also prepare CE/DE storage directories for owner user at boot.

Bug: 22358539
Change-Id: I76228952c990ebed83360c69ef36321b99114196

8 years agoMerge "Create user_de on adopted storage devices."
Jeff Sharkey [Tue, 17 Nov 2015 19:40:05 +0000 (19:40 +0000)]
Merge "Create user_de on adopted storage devices."

8 years agoCreate user_de on adopted storage devices.
Jeff Sharkey [Tue, 17 Nov 2015 19:16:49 +0000 (12:16 -0700)]
Create user_de on adopted storage devices.

Bug: 25676430
Change-Id: I22064789a608f13af2dddf740769969d4e4dcbe7

8 years agoMake deletion of larger files possible.
Paul Crowley [Tue, 7 Jul 2015 16:13:17 +0000 (17:13 +0100)]
Make deletion of larger files possible.

Bug: 22502684
Change-Id: I9034af1ce919bff51f836e5bf51cc2585089440e

8 years agoMerge "Add --no-unlink option to secdiscard for testing."
Paul Crowley [Mon, 16 Nov 2015 10:36:13 +0000 (10:36 +0000)]
Merge "Add --no-unlink option to secdiscard for testing."

8 years agoMerge "secdiscard.cpp: Use getmntent and my newfound C++ knowledge."
Paul Crowley [Thu, 12 Nov 2015 16:59:57 +0000 (16:59 +0000)]
Merge "secdiscard.cpp: Use getmntent and my newfound C++ knowledge."

8 years agoNew granular encryption commands for framework.
Jeff Sharkey [Mon, 9 Nov 2015 01:56:23 +0000 (17:56 -0800)]
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

8 years agoMerge "system/vold: check return value of PKCS5_PBKDF2_HMAC_SHA1." am: 0a7e668ebf...
Kenny Root [Fri, 6 Nov 2015 17:27:03 +0000 (17:27 +0000)]
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.

8 years agoMerge "system/vold: check return value of PKCS5_PBKDF2_HMAC_SHA1." am: 0a7e668ebf
Kenny Root [Fri, 6 Nov 2015 17:24:55 +0000 (17:24 +0000)]
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.

8 years agoMerge "system/vold: check return value of PKCS5_PBKDF2_HMAC_SHA1."
Kenny Root [Fri, 6 Nov 2015 17:22:59 +0000 (17:22 +0000)]
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.

8 years agoMerge "system/vold: check return value of PKCS5_PBKDF2_HMAC_SHA1."
Kenny Root [Fri, 6 Nov 2015 17:20:30 +0000 (17:20 +0000)]
Merge "system/vold: check return value of PKCS5_PBKDF2_HMAC_SHA1."

8 years agosystem/vold: check return value of PKCS5_PBKDF2_HMAC_SHA1.
Adam Langley [Wed, 4 Nov 2015 22:51:39 +0000 (14:51 -0800)]
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

8 years agoAdd developer option to convert from FDE to FBE
Paul Lawrence [Thu, 29 Oct 2015 17:30:57 +0000 (10:30 -0700)]
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

8 years agoMerge commit \'aebfa6e7eee173b8e02f869c3a25cfe2a5fffb9b\' into HEAD am: abcf4c6fca
Bill Yi [Tue, 3 Nov 2015 23:47:58 +0000 (23:47 +0000)]
Merge commit \'aebfa6e7eee173b8e02f869c3a25cfe2a5fffb9b\' into HEAD am: abcf4c6fca
am: ec34abe030

* commit 'ec34abe0306b47640298110c8358c839b2c4432d':

8 years agoMerge commit \'aebfa6e7eee173b8e02f869c3a25cfe2a5fffb9b\' into HEAD
Bill Yi [Tue, 3 Nov 2015 23:34:26 +0000 (23:34 +0000)]
Merge commit \'aebfa6e7eee173b8e02f869c3a25cfe2a5fffb9b\' into HEAD
am: abcf4c6fca

* commit 'abcf4c6fca01c92cd8b4dd581488ede684efea71':

8 years agoMerge commit 'aebfa6e7eee173b8e02f869c3a25cfe2a5fffb9b' into HEAD
Bill Yi [Tue, 3 Nov 2015 22:30:42 +0000 (14:30 -0800)]
Merge commit 'aebfa6e7eee173b8e02f869c3a25cfe2a5fffb9b' into HEAD

8 years agoAdd --no-unlink option to secdiscard for testing.
Paul Crowley [Fri, 3 Jul 2015 15:17:23 +0000 (16:17 +0100)]
Add --no-unlink option to secdiscard for testing.

Also allow deletion of multiple files in one invocation.

Change-Id: I5011bf45f2d3b91964bc68fd8e61ec037e1de2ca

8 years agosecdiscard.cpp: Use getmntent and my newfound C++ knowledge.
Paul Crowley [Wed, 1 Jul 2015 12:33:47 +0000 (13:33 +0100)]
secdiscard.cpp: Use getmntent and my newfound C++ knowledge.

Bug: 19706593
Change-Id: I6254e0339ab42fdbecda80c6f37e64c323329190

8 years agoMerge "Fix ioctl parameter" am: 0eaad8ce8c am: 5cd32f73d8
Elliott Hughes [Thu, 29 Oct 2015 20:47:46 +0000 (20:47 +0000)]
Merge "Fix ioctl parameter" am: 0eaad8ce8c am: 5cd32f73d8
am: 8185d3d8ba

* commit '8185d3d8ba3dec0f26ade8cd4764d5f09cc00bcc':
  Fix ioctl parameter

8 years agoMerge "Fix ioctl parameter" am: 0eaad8ce8c
Elliott Hughes [Thu, 29 Oct 2015 20:44:35 +0000 (20:44 +0000)]
Merge "Fix ioctl parameter" am: 0eaad8ce8c
am: 5cd32f73d8

* commit '5cd32f73d8b5e6db60d397d102e5b1b193a76c77':
  Fix ioctl parameter

8 years agoMerge "Fix ioctl parameter"
Elliott Hughes [Thu, 29 Oct 2015 20:41:28 +0000 (20:41 +0000)]
Merge "Fix ioctl parameter"
am: 0eaad8ce8c

* commit '0eaad8ce8ceaa4b730b0be8c149f389647fbdab0':
  Fix ioctl parameter

8 years agoMerge "Fix ioctl parameter"
Elliott Hughes [Thu, 29 Oct 2015 20:38:10 +0000 (20:38 +0000)]
Merge "Fix ioctl parameter"

8 years agoFix ioctl parameter
caozhiyuan [Thu, 29 Oct 2015 08:39:00 +0000 (16:39 +0800)]
Fix ioctl parameter

Change-Id: I922c8ae77056db81bc5152346299a07a34c527d2

8 years agoPromote free bytes calculation to 64 bits am: 2403b4d056
Oleksiy Avramchenko [Wed, 21 Oct 2015 23:26:18 +0000 (23:26 +0000)]
Promote free bytes calculation to 64 bits am: 2403b4d056
am: aebfa6e7ee

* commit 'aebfa6e7eee173b8e02f869c3a25cfe2a5fffb9b':
  Promote free bytes calculation to 64 bits

8 years agoPromote free bytes calculation to 64 bits
Oleksiy Avramchenko [Wed, 21 Oct 2015 23:24:03 +0000 (23:24 +0000)]
Promote free bytes calculation to 64 bits
am: 2403b4d056

* commit '2403b4d0561c756ed5102aaf6048a80c9993f6f8':
  Promote free bytes calculation to 64 bits

8 years agoKill apps using storage through bind mounts. am: 89f74fbf25
Jeff Sharkey [Wed, 21 Oct 2015 23:11:17 +0000 (23:11 +0000)]
Kill apps using storage through bind mounts. am: 89f74fbf25
am: 71ac649c1d

* commit '71ac649c1d179a8d97db6fd1862f8b0d992a6751':
  Kill apps using storage through bind mounts.

8 years agoKill apps using storage through bind mounts.
Jeff Sharkey [Wed, 21 Oct 2015 23:08:56 +0000 (23:08 +0000)]
Kill apps using storage through bind mounts.
am: 89f74fbf25

* commit '89f74fbf2529d708534c041d2b711af0f1feff9f':
  Kill apps using storage through bind mounts.

8 years agoPromote free bytes calculation to 64 bits
Oleksiy Avramchenko [Thu, 1 Oct 2015 10:44:46 +0000 (12:44 +0200)]
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

8 years agoKill apps using storage through bind mounts.
Jeff Sharkey [Wed, 21 Oct 2015 19:16:12 +0000 (12:16 -0700)]
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

8 years agoDon\'t show UI on default encryption
Paul Lawrence [Wed, 21 Oct 2015 16:46:33 +0000 (16:46 +0000)]
Don\'t show UI on default encryption
am: 6ae8604c10

* commit '6ae8604c1006e6ba0f687680387062d4acf1e41b':
  Don't show UI on default encryption

8 years agoDon't show UI on default encryption
Paul Lawrence [Wed, 21 Oct 2015 16:28:39 +0000 (09:28 -0700)]
Don't show UI on default encryption

Merge of https://googleplex-android-review.git.corp.google.com/#/c/764976

Bug: 22989588
Change-Id: I3a6b01ee80446e0955e2039f88a627d37ee6caef

8 years agoMerge "Promote free bytes calculation to 64 bits" am: 7d17af08a8 am: d3c7060ba5
Jeff Sharkey [Wed, 21 Oct 2015 16:08:09 +0000 (16:08 +0000)]
Merge "Promote free bytes calculation to 64 bits" am: 7d17af08a8 am: d3c7060ba5
am: 0130fc6cfb

* commit '0130fc6cfb77c4a835e7df2f48fc47fdd1a9855a':
  Promote free bytes calculation to 64 bits

8 years agoMerge "Promote free bytes calculation to 64 bits" am: 7d17af08a8
Jeff Sharkey [Wed, 21 Oct 2015 16:03:06 +0000 (16:03 +0000)]
Merge "Promote free bytes calculation to 64 bits" am: 7d17af08a8
am: d3c7060ba5

* commit 'd3c7060ba53d87c58103b1776815fea9d29e39cc':
  Promote free bytes calculation to 64 bits

8 years agoMerge "Promote free bytes calculation to 64 bits"
Jeff Sharkey [Wed, 21 Oct 2015 15:58:40 +0000 (15:58 +0000)]
Merge "Promote free bytes calculation to 64 bits"
am: 7d17af08a8

* commit '7d17af08a80c3d9a14a3fe11d70bd12d59641a7b':
  Promote free bytes calculation to 64 bits

8 years agoMerge "Promote free bytes calculation to 64 bits"
Jeff Sharkey [Wed, 21 Oct 2015 15:44:36 +0000 (15:44 +0000)]
Merge "Promote free bytes calculation to 64 bits"

8 years agoMerge "Don\'t show UI on default encryption" into mnc-dr-dev am: 2309f76d17
Paul Lawrence [Wed, 21 Oct 2015 15:08:48 +0000 (15:08 +0000)]
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

8 years agoMerge "Don\'t show UI on default encryption" into mnc-dr-dev
Paul Lawrence [Wed, 21 Oct 2015 15:03:10 +0000 (15:03 +0000)]
Merge "Don\'t show UI on default encryption" into mnc-dr-dev
am: 2309f76d17

* commit '2309f76d17171a4e9b2593ff248861eb3a41ec5a':
  Don't show UI on default encryption

8 years agoMerge "Don't show UI on default encryption" into mnc-dr-dev
Paul Lawrence [Wed, 21 Oct 2015 14:27:30 +0000 (14:27 +0000)]
Merge "Don't show UI on default encryption" into mnc-dr-dev

8 years agovold: fix 64 bit ioctl error
Mateusz Nowak [Mon, 3 Aug 2015 16:06:39 +0000 (18:06 +0200)]
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>
8 years agoMake sure path is not NULL to avoid fatal exception.
Mateusz Nowak [Mon, 3 Aug 2015 14:39:19 +0000 (16:39 +0200)]
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>
8 years agoHandle non-format partition in Vold
Mateusz Nowak [Mon, 3 Aug 2015 13:48:52 +0000 (15:48 +0200)]
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>
8 years agoam f6852593: am cb42a40a: Merge "Clean up any/all stale partition tables." into mnc...
Jeff Sharkey [Mon, 12 Oct 2015 18:38:56 +0000 (18:38 +0000)]
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.

8 years agoam cb42a40a: Merge "Clean up any/all stale partition tables." into mnc-dr-dev
Jeff Sharkey [Mon, 12 Oct 2015 16:48:57 +0000 (16:48 +0000)]
am cb42a40a: Merge "Clean up any/all stale partition tables." into mnc-dr-dev

* commit 'cb42a40a871bc8f06f0a37d321dbe2e7693da0e5':
  Clean up any/all stale partition tables.

8 years agoMerge "Clean up any/all stale partition tables." into mnc-dr-dev
Jeff Sharkey [Mon, 12 Oct 2015 16:34:09 +0000 (16:34 +0000)]
Merge "Clean up any/all stale partition tables." into mnc-dr-dev

8 years agoPromote free bytes calculation to 64 bits
Oleksiy Avramchenko [Thu, 1 Oct 2015 10:44:46 +0000 (12:44 +0200)]
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

8 years agoam f0500a08: am 0331d4ae: am 685dfdd3: Merge "Error correction: Add libfec dependenci...
Sami Tolvanen [Fri, 2 Oct 2015 11:00:45 +0000 (11:00 +0000)]
am f0500a08: am 0331d4ae: am 685dfdd3: Merge "Error correction: Add libfec dependencies for vold"

* commit 'f0500a08230f068a1cf55e4de3cfc389d51f8669':
  Error correction: Add libfec dependencies for vold

8 years agoam 0331d4ae: am 685dfdd3: Merge "Error correction: Add libfec dependencies for vold"
Sami Tolvanen [Fri, 2 Oct 2015 10:55:10 +0000 (10:55 +0000)]
am 0331d4ae: am 685dfdd3: Merge "Error correction: Add libfec dependencies for vold"

* commit '0331d4ae3843f682e98bfa1aba0f8da7fbd9beb0':
  Error correction: Add libfec dependencies for vold

8 years agoam 685dfdd3: Merge "Error correction: Add libfec dependencies for vold"
Sami Tolvanen [Fri, 2 Oct 2015 10:47:23 +0000 (10:47 +0000)]
am 685dfdd3: Merge "Error correction: Add libfec dependencies for vold"

* commit '685dfdd33590ef8a93627015c434fea54b8f1b4d':
  Error correction: Add libfec dependencies for vold

8 years agoMerge "Error correction: Add libfec dependencies for vold"
Sami Tolvanen [Fri, 2 Oct 2015 10:42:16 +0000 (10:42 +0000)]
Merge "Error correction: Add libfec dependencies for vold"

8 years agoam 44710f0f: am 82fd804f: vold: Retry opening block device on failure when starting...
David Ng [Fri, 2 Oct 2015 09:00:31 +0000 (09:00 +0000)]
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

8 years agoam 82fd804f: vold: Retry opening block device on failure when starting encryption
David Ng [Fri, 2 Oct 2015 08:27:19 +0000 (08:27 +0000)]
am 82fd804f: vold: Retry opening block device on failure when starting encryption

* commit '82fd804f8ba49399f425bf43681b9b7fe464d9a1':
  vold: Retry opening block device on failure when starting encryption

8 years agovold: Retry opening block device on failure when starting encryption
David Ng [Wed, 21 Jan 2015 21:55:21 +0000 (13:55 -0800)]
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

8 years agoError correction: Add libfec dependencies for vold
Sami Tolvanen [Mon, 1 Jun 2015 14:38:29 +0000 (15:38 +0100)]
Error correction: Add libfec dependencies for vold

Vold requires libfec and related dependencies due to fs_mgr_mount_all.

Bug: 21893453
Change-Id: If59df0c5fd3395d4aac97dd8119b7c70c0fa5d4d

8 years agoClean up any/all stale partition tables.
Jeff Sharkey [Wed, 23 Sep 2015 21:13:45 +0000 (14:13 -0700)]
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

8 years agoam 1690c1bc: am 1a20a648: Enable benchmark after trim, when requested.
Jeff Sharkey [Thu, 10 Sep 2015 00:53:30 +0000 (00:53 +0000)]
am 1690c1bc: am 1a20a648: Enable benchmark after trim, when requested.

* commit '1690c1bca2b7d7e08f1b0f536b6e58a890051546':
  Enable benchmark after trim, when requested.

8 years agoam 1a20a648: Enable benchmark after trim, when requested.
Jeff Sharkey [Thu, 10 Sep 2015 00:44:21 +0000 (00:44 +0000)]
am 1a20a648: Enable benchmark after trim, when requested.

* commit '1a20a6487faad2869eaec962e4373402aa7461b3':
  Enable benchmark after trim, when requested.

8 years agoEnable benchmark after trim, when requested.
Jeff Sharkey [Wed, 9 Sep 2015 21:55:45 +0000 (14:55 -0700)]
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

8 years agoDon't show UI on default encryption
Paul Lawrence [Wed, 9 Sep 2015 19:13:00 +0000 (12:13 -0700)]
Don't show UI on default encryption

Bug: 22989588
Change-Id: I21403233d84031869d929c46c3c7b2ebefb3caff

8 years agoam 2ada9517: am 480fcd27: Set uid/gid of newly created user dirs to system/system.
Paul Crowley [Thu, 3 Sep 2015 06:32:37 +0000 (06:32 +0000)]
am 2ada9517: am 480fcd27: Set uid/gid of newly created user dirs to system/system.

* commit '2ada95176863c9f73dbaea64e57c46a1a45b632f':
  Set uid/gid of newly created user dirs to system/system.

8 years agoam 480fcd27: Set uid/gid of newly created user dirs to system/system.
Paul Crowley [Thu, 3 Sep 2015 06:21:41 +0000 (06:21 +0000)]
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.

8 years agoam fa68681a: am 79b6fdfc: (-s ours) update bundled rc files to their contents from...
Tom Cherry [Thu, 27 Aug 2015 14:46:08 +0000 (14:46 +0000)]
am fa68681a: am 79b6fdfc: (-s ours) update bundled rc files to their contents from rootdir/init.rc

* commit 'fa68681ac763b458f9e3afc8c2bfcb9e22a3cda4':
  update bundled rc files to their contents from rootdir/init.rc

8 years agoam efbaf0de: am 685439bb: (-s ours) am 218f48d6: Merge "bundle init.rc contents with...
Tom Cherry [Thu, 27 Aug 2015 14:46:08 +0000 (14:46 +0000)]
am efbaf0de: am 685439bb: (-s ours) am 218f48d6: Merge "bundle init.rc contents with its service"

* commit 'efbaf0de3651c7efa3ed946bcd9f11781cc1fe68':

8 years agoam debb3f8c: am b1259ffd: (-s ours) am f298f6be: Merge "Use errno correctly."
Elliott Hughes [Thu, 27 Aug 2015 14:46:07 +0000 (14:46 +0000)]
am debb3f8c: am b1259ffd: (-s ours) am f298f6be: Merge "Use errno correctly."

* commit 'debb3f8cba49db2dff687a5758aebdbbd99b6393':