Richard Uhler
3ed63e8d21
Merge "Revert "Add support for gid derivation on private volumes"" am: 9588da7095
...
am: 6b264e4a4c
2017-09-22 17:30:00 +00:00
Richard Uhler
6b264e4a4c
Merge "Revert "Add support for gid derivation on private volumes""
...
am: 9588da7095
2017-09-22 17:24:03 +00:00
Treehugger Robot
9588da7095
Merge "Revert "Add support for gid derivation on private volumes""
2017-09-22 17:21:55 +00:00
Richard Uhler
32a7b7fe82
Revert "Add support for gid derivation on private volumes"
...
This reverts commit 1b38e33003a3a60b372e
2017-09-22 09:04:05 -07:00
Daniel Rosenberg
2c629a9d48
Merge "Add support for gid derivation on private volumes" am: 0b7dbf0b1c
...
am: c2c183e02c
2017-09-21 01:05:14 +00:00
Daniel Rosenberg
c2c183e02c
Merge "Add support for gid derivation on private volumes"
...
am: 0b7dbf0b1c
2017-09-21 01:03:16 +00:00
Treehugger Robot
0b7dbf0b1c
Merge "Add support for gid derivation on private volumes"
2017-09-21 00:57:48 +00:00
Daniel Rosenberg
4e8cec1fce
Add support for gid derivation on private volumes
...
This sdcardfs feature was moved under a mount option
and is only needed on private volumes
Test: Private emulated volume should attempt to mount with
derive_gid option.
Bug: 63245673
Change-Id: I40a8b15c298c815a4643007b9eca8269379fd2ac
2017-09-20 15:57:52 -07:00
Luis Hector Chavez
d896787df7
Merge "Invert the order of SO_RCVBUFFORCE and SO_RCVBUFF" am: a3258252ad
...
am: 2aa4643dca
2017-09-06 19:52:35 +00:00
Luis Hector Chavez
2aa4643dca
Merge "Invert the order of SO_RCVBUFFORCE and SO_RCVBUFF"
...
am: a3258252ad
2017-09-06 19:48:35 +00:00
Treehugger Robot
a3258252ad
Merge "Invert the order of SO_RCVBUFFORCE and SO_RCVBUFF"
2017-09-06 19:32:03 +00:00
Josh Gao
c01810be33
Merge "Switch RebootType to an enum class." am: db725d3348
...
am: da54114d23
2017-08-29 21:54:20 +00:00
Josh Gao
da54114d23
Merge "Switch RebootType to an enum class."
...
am: db725d3348
2017-08-29 21:47:58 +00:00
Treehugger Robot
db725d3348
Merge "Switch RebootType to an enum class."
2017-08-29 21:26:39 +00:00
Luis Hector Chavez
d1b00de2c1
Invert the order of SO_RCVBUFFORCE and SO_RCVBUFF
...
This change swaps the order of SO_RCVBUFFORCE and SO_RCVBUFF, because
the latter is silently capped to sysctl_rmem_max. So, just try
SO_RCVBUFF if the former failed.
Bug: 62417946
Test: Run android in a new user and network namespace, vold does not
abort here.
Change-Id: Iac2ddae6fbb80ba84afe5414eade978cd795ef3c
2017-08-29 10:29:48 -07:00
Josh Gao
fec4437972
Switch RebootType to an enum class.
...
RebootType's shutdown enumerator collides with the shutdown socket
function, which causes problems when <sys/socket.h> gets included
transitively. Switch RebootType into an enum class, to namespace its
enumerators.
Test: treehugger
Change-Id: Ib5e8667df363acb28771430fd43000d381dc8620
2017-08-28 13:22:55 -07:00
Keun-young Park
23b87ecf41
Merge "mInternalEmulated could be used after shutdown() called" am: 9b4a443bd6 am: 92052aa582
...
am: 1b6d8237f2
2017-08-17 22:21:40 +00:00
Keun-young Park
1b6d8237f2
Merge "mInternalEmulated could be used after shutdown() called" am: 9b4a443bd6
...
am: 92052aa582
2017-08-17 22:17:10 +00:00
Keun-young Park
92052aa582
Merge "mInternalEmulated could be used after shutdown() called"
...
am: 9b4a443bd6
2017-08-17 22:13:40 +00:00
Keun-young Park
9b4a443bd6
Merge "mInternalEmulated could be used after shutdown() called"
2017-08-17 22:10:24 +00:00
Gao Xiang
d263da8807
mInternalEmulated could be used after shutdown() called
...
It fixes the findvolume() / reset() use-after-free issue after
shutdown called to avoid vold crash.
Fixes: a5bbb5e3c1
2017-08-14 14:26:56 +08:00
Keun-young Park
4460d0e554
do not sleep if it is shutting down
...
am: 375ac25773
2017-08-03 18:28:14 +00:00
Keun-young Park
375ac25773
do not sleep if it is shutting down
...
- Various sleep(5) for vold shutdown can increase shutdown time a lot.
- If it is shutting down, do not sleep at all. init will take care of
active partitions if not unmounted.
bug: 64143519
Test: reboot and check logs from vold, check if "ShutdownThread: Shutdown wait timed out" happens.
Change-Id: I7cb91427ad2205fe23a054d255caf7ffdfd9f6c3
2017-08-02 17:45:48 -07:00
Elliott Hughes
f14b2fdca9
Merge "Move off deprecated readdir_r." am: 1647759651 am: b60d874f24
...
am: 984b786b0e
2017-08-02 17:27:29 +00:00
Elliott Hughes
984b786b0e
Merge "Move off deprecated readdir_r." am: 1647759651
...
am: b60d874f24
2017-08-02 17:22:55 +00:00
Elliott Hughes
b60d874f24
Merge "Move off deprecated readdir_r."
...
am: 1647759651
2017-08-02 17:19:01 +00:00
Elliott Hughes
1647759651
Merge "Move off deprecated readdir_r."
2017-08-02 17:12:21 +00:00
Elliott Hughes
4e3da6e96f
Move off deprecated readdir_r.
...
Bug: http://b/32678321
Test: builds
Change-Id: I2d6e995d5eed3e72e12ce8b8f82a10143a256cd4
2017-08-01 17:39:44 -07:00
Junichi Uekawa
189527f13f
Merge "Try SO_RCVBUF before SO_RCVBUFFORCE." am: 3f8fa0c215 am: dfcc7dbad0
...
am: 602a2ce0e0
2017-07-13 20:37:17 +00:00
Junichi Uekawa
602a2ce0e0
Merge "Try SO_RCVBUF before SO_RCVBUFFORCE." am: 3f8fa0c215
...
am: dfcc7dbad0
2017-07-13 20:34:46 +00:00
Junichi Uekawa
dfcc7dbad0
Merge "Try SO_RCVBUF before SO_RCVBUFFORCE."
...
am: 3f8fa0c215
2017-07-13 20:32:18 +00:00
Treehugger Robot
3f8fa0c215
Merge "Try SO_RCVBUF before SO_RCVBUFFORCE."
2017-07-13 20:21:49 +00:00
Junichi Uekawa
c865adaa3b
Try SO_RCVBUF before SO_RCVBUFFORCE.
...
When running in a container, the process might be in a user/net
namespace, which would cause setting the SO_RCVBUFFORCE socket option to
fail with EPERM. But rmem_max is set to a high enough value which allows
SO_RCVBUF to succeed.
Bug: 62417946
Test: Run android in a new user and network namespace, vold does not
abort here.
Change-Id: I2b678ddd886a406a3394d9fdd33f9c8800ef78a3
Signed-off-by: Junichi Uekawa <uekawa@google.com>
(cherry picked from commit b41155d4af0e00fc6f65d7d67b80e7b866f847d6)
2017-07-11 15:51:54 -07:00
Keun-young Park
4f58be1b69
add vold to "shutdown critical"
...
am: 85f412b4ee
2017-07-06 17:22:35 +00:00
Android Build Merger (Role)
f39281b68c
Merge "Merge "add vold to "shutdown critical"" am: da85cb71b3 am: 228b95fa15 am: 733fe09928" into oc-dr1-dev-plus-aosp
2017-07-06 01:14:00 +00:00
Keun-young Park
681b90811c
Merge "add vold to "shutdown critical"" am: da85cb71b3 am: 228b95fa15
...
am: 733fe09928
2017-07-06 01:13:30 +00:00
Keun-young Park
9045c86a32
Merge "add vold to "shutdown critical"" am: da85cb71b3 am: 228b95fa15
...
am: 733fe09928
2017-07-06 01:13:21 +00:00
Keun-young Park
733fe09928
Merge "add vold to "shutdown critical"" am: da85cb71b3
...
am: 228b95fa15
2017-07-06 00:56:21 +00:00
Keun-young Park
85f412b4ee
add vold to "shutdown critical"
...
bug: 37626581
Test: reboot and check last kmsg
(cherry picked from commit 41156c5035
2017-07-06 00:53:42 +00:00
Keun-young Park
228b95fa15
Merge "add vold to "shutdown critical""
...
am: da85cb71b3
2017-07-06 00:46:34 +00:00
Treehugger Robot
da85cb71b3
Merge "add vold to "shutdown critical""
2017-07-06 00:40:55 +00:00
Keun-young Park
41156c5035
add vold to "shutdown critical"
...
bug: 37626581
Test: reboot and check last kmsg
Change-Id: I2c186c20a4afc342eaae420175013c80219a5ee5
2017-07-05 13:58:35 -07:00
Paul Crowley
071120776a
resolve merge conflicts of 8e6f6a5 to oc-dr1-dev-plus-aosp
...
Test: None
Change-Id: Icf7654b3200a4afd104f31aff8ce5b09867b7182
2017-06-28 16:09:00 -07:00
Paul Crowley
8e6f6a5ceb
resolve merge conflicts of 4ad7784 to stage-aosp-master
...
am: ddb542f574
2017-06-28 22:45:50 +00:00
Paul Crowley
ddb542f574
resolve merge conflicts of 4ad7784 to stage-aosp-master
...
Test: Build seems to be unrelatedly broken
Change-Id: I2df307aa1c7134f217c558495e1438412480f324
Merged-In: I6ccfe0894551ba068de9bf5e23fe4fd1e10e36b1
2017-06-28 21:52:46 +00:00
Treehugger Robot
4ad7784b07
Merge "Label keys with all the possible FBE prefixes that might apply"
2017-06-27 16:17:22 +00:00
Paul Crowley
ab4cc7814f
Label keys with all the possible FBE prefixes that might apply
...
We don't know which FS and kernel version is going to want these keys,
so put them in the kernel three times with all three possible prefixes.
Bug: 62900873
Test: Marlin set up before this change successfully boots after it.
Change-Id: I6ccfe0894551ba068de9bf5e23fe4fd1e10e36b1
2017-06-26 09:58:31 -07:00
Tom Cherry
bd40570e25
Merge "Use WaitForProperty() to wait for restorecon" am: 963a205a1b am: 80ce34d6cb
...
am: dfd0492354
2017-06-16 06:01:26 +00:00
Tom Cherry
dfd0492354
Merge "Use WaitForProperty() to wait for restorecon" am: 963a205a1b
...
am: 80ce34d6cb
2017-06-16 05:57:12 +00:00
Tom Cherry
80ce34d6cb
Merge "Use WaitForProperty() to wait for restorecon"
...
am: 963a205a1b
2017-06-16 05:53:12 +00:00
