Paul Crowley
68b565336b
Merge "Remove CheckBattery altogether" am: 2890b8d215
-s ours
...
am: 90a9c44f9d
Change-Id: Ie6d021923c2fe396d954b4df07eb293a9cf3dd6d
7 years ago
Paul Crowley
90a9c44f9d
Merge "Remove CheckBattery altogether"
...
am: 2890b8d215
-s ours
Change-Id: I3ad2174feea5d62b9bcff2119032abd80254d77c
7 years ago
Paul Crowley
584610f325
Remove CheckBattery altogether
...
Test: changed Angler fstab to encryptable and encrypted.
Bug: 16868177
Change-Id: I17d36ea838d6d96f0752b2d6d03b1f9a781ed018
7 years ago
Treehugger Robot
2890b8d215
Merge "Remove CheckBattery altogether"
7 years ago
Paul Crowley
de90f76fe2
Remove CheckBattery altogether
...
am: a04014bf26
Change-Id: I7aefe1d6f4815a7f02671869fe940a3cdd13cd70
7 years ago
Paul Crowley
a04014bf26
Remove CheckBattery altogether
...
Test: changed Angler fstab to encryptable and encrypted.
Bug: 16868177
Change-Id: I17d36ea838d6d96f0752b2d6d03b1f9a781ed018
7 years ago
Paul Crowley
1b992e4f26
Remove CheckBattery altogether
...
Test: changed Angler fstab to encryptable and encrypted.
Bug: 16868177
Change-Id: I17d36ea838d6d96f0752b2d6d03b1f9a781ed018
7 years ago
Yifan Hong
da59b50f70
Merge "vold: remove unnecessary dependency on libbatteryservice." am: 7b0ac6d37e
am: 2313818c46
...
am: a6f34f6e78
Change-Id: I824e6e9285013895bc989e2667e297e130b6e1af
7 years ago
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
Rom Lemarchand
958c216d87
Revert "Revert "Add support for gid derivation on private volumes""
...
This reverts commit a3a60b372e
.
Reason for revert: All kernel prebuilts merged
(cherry picked from commit 75ae529bf8
)
Bug: 65600849
Bug: 65573871
Test: m
Change-Id: I75b0cb1d82213b875cbef8d39f4f1a8fb34b9795
7 years ago
Richard Uhler
4a921633fa
Merge "Revert "Add support for gid derivation on private volumes"" am: 9588da7095
am: 6b264e4a4c
...
am: 3ed63e8d21
Change-Id: Ie3abbe2dee226330576e42b44910652ff272eb74
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
d9307f8df7
Merge "Add support for gid derivation on private volumes" am: 0b7dbf0b1c
am: c2c183e02c
...
am: 2c629a9d48
Change-Id: I3479e5656327023526ffbf8c9b973362e4df2321
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
Rom Lemarchand
29e8bb5df1
Merge "Revert "Revert "Add support for gid derivation on private volumes""" into oc-mr1-dev
...
am: d4af166db8
Change-Id: Iadec8e0e5edec0a61d15d46dd85e0ec7253da62a
7 years ago
TreeHugger Robot
d4af166db8
Merge "Revert "Revert "Add support for gid derivation on private volumes""" into oc-mr1-dev
7 years ago
Rom Lemarchand
75ae529bf8
Revert "Revert "Add support for gid derivation on private volumes""
...
This reverts commit a3a60b372e
.
Reason for revert: All kernel prebuilts merged
Bug: 65600849
Bug: 65573871
Change-Id: I75b0cb1d82213b875cbef8d39f4f1a8fb34b9795
7 years ago
Richard Uhler
fe64fee09d
Merge "Revert "Add support for gid derivation on private volumes"" into oc-mr1-dev
...
am: 3bfa263f53
Change-Id: Ib9b44d214fbe6822da18ed4f4cc850c0314426b5
7 years ago
Daniel Rosenberg
d3cde53e0e
Merge "Add support for gid derivation on private volumes" into oc-mr1-dev
...
am: e335ee8f72
Change-Id: I4546ead188fc1e8fc675153586b1c4b4500f9c72
7 years ago
Richard Uhler
3bfa263f53
Merge "Revert "Add support for gid derivation on private volumes"" into oc-mr1-dev
7 years ago
Richard Uhler
a3a60b372e
Revert "Add support for gid derivation on private volumes"
...
This reverts commit 1b38e33003
.
Causes a boot loop on bullhead.
Bug: 63245673
Bug: 65660058
Change-Id: I9c8afd3ba22547aff5aff06b71cb8ff3b8a07350
7 years ago
Chen, Luhai
be03a5aad0
Fix keyname generation issue
...
am: 5744dfe3cc
Change-Id: Iad7a5325249b609720a295473194e40ff1747d4a
7 years ago
TreeHugger Robot
e335ee8f72
Merge "Add support for gid derivation on private volumes" into oc-mr1-dev
7 years ago
Chen, Luhai
5744dfe3cc
Fix keyname generation issue
...
The keyname binded to keyring return a wrong string when there are binary char larger than 127,
the sign extension will introduce unexpect FFFFFF string to the keyname.
Bug: 65423023
Test: local build with boot test and device encryption status check.
Change-Id: I26482c98ac1858a63b9f5c3f84a8699fd6a21cd7
Signed-off-by: Ai, Ting A <ting.a.ai@intel.com>
Signed-off-by: Chen, Luhai <luhai.chen@intel.com>
7 years ago
Daniel Rosenberg
1b38e33003
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
b216a0a2ee
Merge "Invert the order of SO_RCVBUFFORCE and SO_RCVBUFF" am: a3258252ad
am: 2aa4643dca
...
am: d896787df7
Change-Id: I3b72e82b030c685d7e11fa00601774eaba3c241c
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
41770aab2c
Merge "Switch RebootType to an enum class." am: db725d3348
am: da54114d23
...
am: c01810be33
Change-Id: Ie54bffd0befd917165debfd8d6eff8f9552d6949
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
Gao Xiang
bd6ca4a69a
mInternalEmulated could be used after shutdown() called
...
am: 7056de1b42
Change-Id: I26fd9a89730491f22397e92fb35275504ebcd744
7 years ago
Gao Xiang
7056de1b42
mInternalEmulated could be used after shutdown() called
...
It fixes the findvolume() / reset() use-after-free issue after
shutdown called to avoid vold crash.
bug: 64833901
Test: test reboot
Fixes: a5bbb5e3c1
("make shutdown safe for double calls.")
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
(cherry picked from commit d263da8807
)
Change-Id: I636b28f30fb82e4672d88144cd04072d24ef3b85
7 years ago
Keun-young Park
eddeea7fa7
Merge "mInternalEmulated could be used after shutdown() called" am: 9b4a443bd6
am: 92052aa582
am: 1b6d8237f2
...
am: 23b87ecf41
Change-Id: I2aeed83fad9d3690c12e5e7a4603697f3a06119b
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