ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "remount: Replace ServiceManager::getService with checkService" into main am: 4131a3afd1 am: 18cea8df37 am: 9365d00cf2

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2690886

Change-Id: Icca016b6f21de335a0417cd57e9fc9486724d7bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yi-Yo Chiang 2023-08-04 05:53:50 +00:00 • committed by Automerger Merge Worker
commit a8a84f49af
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
fs_mgr/fs_mgr_remount.cpp
View file

@ -128,12 +128,11 @@ class MyLogger {
}
static android::sp<android::os::IVold> GetVold() {
auto sm = android::defaultServiceManager();
while (true) {
if (auto sm = android::defaultServiceManager()) {
if (auto binder = sm->getService(android::String16("vold"))) {
if (auto vold = android::interface_cast<android::os::IVold>(binder)) {
return vold;
}
if (auto binder = sm->checkService(android::String16("vold"))) {
if (auto vold = android::interface_cast<android::os::IVold>(binder)) {
return vold;
}
}
std::this_thread::sleep_for(2s);