Yifan Hong
a6f34f6e78
Merge "vold: remove unnecessary dependency on libbatteryservice." am: 7b0ac6d37e
...
am: 2313818c46
Change-Id: I1faae4261398a107aee274a7b6a4b05766786257
7 years ago
Yifan Hong
2313818c46
Merge "vold: remove unnecessary dependency on libbatteryservice."
...
am: 7b0ac6d37e
Change-Id: I772e82a8ae54477014076be34b7dab5cb968fba7
7 years ago
Treehugger Robot
7b0ac6d37e
Merge "vold: remove unnecessary dependency on libbatteryservice."
7 years ago
Yifan Hong
57838d665f
vold: remove unnecessary dependency on libbatteryservice.
...
Battery check could be replaced by hwbinder calls into
android.hardware.health@2.0 instead, but because
of b/16868177, this is actually not needed.
Bug: 62229583
Test: pass
Change-Id: Ieb03e6ee2f648d9c1d85dbbdc10626726f5fe39b
7 years ago
Richard Uhler
3ed63e8d21
Merge "Revert "Add support for gid derivation on private volumes"" am: 9588da7095
...
am: 6b264e4a4c
Change-Id: Ic617080e8f98079bd3075621dc85f5dfa00ff5ba
7 years ago
Richard Uhler
6b264e4a4c
Merge "Revert "Add support for gid derivation on private volumes""
...
am: 9588da7095
Change-Id: Ie2e32cca7542cdc1aaec5e8481b6a255b3c3b298
7 years ago
Treehugger Robot
9588da7095
Merge "Revert "Add support for gid derivation on private volumes""
7 years ago
Richard Uhler
32a7b7fe82
Revert "Add support for gid derivation on private volumes"
...
This reverts commit 1b38e33003
.
Causes a boot loop on bullhead.
(cherry picked from commit a3a60b372e
)
Bug: 63245673
Bug: 65660058
Test: m
Merged-In: I9c8afd3ba22547aff5aff06b71cb8ff3b8a07350
Change-Id: I9c8afd3ba22547aff5aff06b71cb8ff3b8a07350
7 years ago
Daniel Rosenberg
2c629a9d48
Merge "Add support for gid derivation on private volumes" am: 0b7dbf0b1c
...
am: c2c183e02c
Change-Id: I71b1249e1d97bda5dc177881e0d01e3374bcf0a8
7 years ago
Daniel Rosenberg
c2c183e02c
Merge "Add support for gid derivation on private volumes"
...
am: 0b7dbf0b1c
Change-Id: I55313f24f2d932fb76d1b107c9e765b507f0403d
7 years ago
Treehugger Robot
0b7dbf0b1c
Merge "Add support for gid derivation on private volumes"
7 years ago
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
7 years ago
Luis Hector Chavez
d896787df7
Merge "Invert the order of SO_RCVBUFFORCE and SO_RCVBUFF" am: a3258252ad
...
am: 2aa4643dca
Change-Id: I959f84c8e0962ddda76016f4bfa456970bf52be3
7 years ago
Luis Hector Chavez
2aa4643dca
Merge "Invert the order of SO_RCVBUFFORCE and SO_RCVBUFF"
...
am: a3258252ad
Change-Id: I92981e2eb069c4b01ac8d1be51abddb47602529c
7 years ago
Treehugger Robot
a3258252ad
Merge "Invert the order of SO_RCVBUFFORCE and SO_RCVBUFF"
7 years ago
Josh Gao
c01810be33
Merge "Switch RebootType to an enum class." am: db725d3348
...
am: da54114d23
Change-Id: I36b78d3ece0bef5ebedc3193ba989afdfb97e777
7 years ago
Josh Gao
da54114d23
Merge "Switch RebootType to an enum class."
...
am: db725d3348
Change-Id: I72431dc56d20cf1acb2443ae3d67300a59e10ad3
7 years ago
Treehugger Robot
db725d3348
Merge "Switch RebootType to an enum class."
7 years ago
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
7 years ago
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
7 years ago
Keun-young Park
23b87ecf41
Merge "mInternalEmulated could be used after shutdown() called" am: 9b4a443bd6
am: 92052aa582
...
am: 1b6d8237f2
Change-Id: I71b1ec275e2850c1a8273ac5eebc7373a0729552
7 years ago
Keun-young Park
1b6d8237f2
Merge "mInternalEmulated could be used after shutdown() called" am: 9b4a443bd6
...
am: 92052aa582
Change-Id: I7cd336807b1084bb52fcc2d973b2fd8efe5f54c7
7 years ago
Keun-young Park
92052aa582
Merge "mInternalEmulated could be used after shutdown() called"
...
am: 9b4a443bd6
Change-Id: Ia1007988297c39f391b35ad51645556ceeaf0cc6
7 years ago
Keun-young Park
9b4a443bd6
Merge "mInternalEmulated could be used after shutdown() called"
7 years ago
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
("make shutdown safe for double calls.")
Change-Id: I50f216141b20da08549080291091dc5690c00ffe
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
7 years ago
Keun-young Park
4460d0e554
do not sleep if it is shutting down
...
am: 375ac25773
Change-Id: Id0aa75c190b7012f4d329533fcd664341ae8c26b
7 years ago
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
7 years ago
Elliott Hughes
f14b2fdca9
Merge "Move off deprecated readdir_r." am: 1647759651
am: b60d874f24
...
am: 984b786b0e
Change-Id: Ida8d9a0830cf660155d50e5179d9199717ee1720
7 years ago
Elliott Hughes
984b786b0e
Merge "Move off deprecated readdir_r." am: 1647759651
...
am: b60d874f24
Change-Id: Ic4370c02cf1d83281ffadedd9c2e1006d3748cf1
7 years ago
Elliott Hughes
b60d874f24
Merge "Move off deprecated readdir_r."
...
am: 1647759651
Change-Id: I4f5a6422eaef6be21d29f5ddc2b98ee53376e6a0
7 years ago
Elliott Hughes
1647759651
Merge "Move off deprecated readdir_r."
7 years ago
Elliott Hughes
4e3da6e96f
Move off deprecated readdir_r.
...
Bug: http://b/32678321
Test: builds
Change-Id: I2d6e995d5eed3e72e12ce8b8f82a10143a256cd4
7 years ago
Junichi Uekawa
189527f13f
Merge "Try SO_RCVBUF before SO_RCVBUFFORCE." am: 3f8fa0c215
am: dfcc7dbad0
...
am: 602a2ce0e0
Change-Id: I4d4946552edb444f4a3a7ea333f272a7408ec260
7 years ago
Junichi Uekawa
602a2ce0e0
Merge "Try SO_RCVBUF before SO_RCVBUFFORCE." am: 3f8fa0c215
...
am: dfcc7dbad0
Change-Id: I742ebc5174d809fa6f70324659f6e03798710679
7 years ago
Junichi Uekawa
dfcc7dbad0
Merge "Try SO_RCVBUF before SO_RCVBUFFORCE."
...
am: 3f8fa0c215
Change-Id: I5df611cfaa1c4451f4d0cd576f3b82f2fefbea6b
7 years ago
Treehugger Robot
3f8fa0c215
Merge "Try SO_RCVBUF before SO_RCVBUFFORCE."
7 years ago
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)
7 years ago
Keun-young Park
4f58be1b69
add vold to "shutdown critical"
...
am: 85f412b4ee
Change-Id: Ib346b39be455571656c4732d2ad63b3edbe1e0cd
7 years ago
Android Build Merger (Role)
f39281b68c
Merge "Merge "add vold to "shutdown critical"" am: da85cb71b3
am: 228b95fa15
am: 733fe09928" into oc-dr1-dev-plus-aosp
7 years ago
Keun-young Park
681b90811c
Merge "add vold to "shutdown critical"" am: da85cb71b3
am: 228b95fa15
...
am: 733fe09928
Change-Id: I123056823f31b7e8d0ad3a6ae7775867d3dd0edb
7 years ago
Keun-young Park
9045c86a32
Merge "add vold to "shutdown critical"" am: da85cb71b3
am: 228b95fa15
...
am: 733fe09928
Change-Id: I760a1278d3138ca7a24ab69613466c83615f067d
7 years ago
Keun-young Park
733fe09928
Merge "add vold to "shutdown critical"" am: da85cb71b3
...
am: 228b95fa15
Change-Id: I0de967657d969f54dedddbb2b72ab07ed650e2e3
7 years ago
Keun-young Park
85f412b4ee
add vold to "shutdown critical"
...
bug: 37626581
Test: reboot and check last kmsg
(cherry picked from commit 41156c5035
)
Change-Id: I363dbbe58d2cb46b521ebdcea85c507679f27206
7 years ago
Keun-young Park
228b95fa15
Merge "add vold to "shutdown critical""
...
am: da85cb71b3
Change-Id: Ib0e4977590a94d7934001c223677cff45e59cd0a
7 years ago
Treehugger Robot
da85cb71b3
Merge "add vold to "shutdown critical""
7 years ago
Keun-young Park
41156c5035
add vold to "shutdown critical"
...
bug: 37626581
Test: reboot and check last kmsg
Change-Id: I2c186c20a4afc342eaae420175013c80219a5ee5
7 years ago
Paul Crowley
071120776a
resolve merge conflicts of 8e6f6a5
to oc-dr1-dev-plus-aosp
...
Test: None
Change-Id: Icf7654b3200a4afd104f31aff8ce5b09867b7182
7 years ago
Paul Crowley
8e6f6a5ceb
resolve merge conflicts of 4ad7784
to stage-aosp-master
...
am: ddb542f574
Change-Id: Iedef223a14b8a0c8dc558440b429a33d6b23f948
7 years ago
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
7 years ago
Treehugger Robot
4ad7784b07
Merge "Label keys with all the possible FBE prefixes that might apply"
7 years ago