commit 4131a3afd1392c68c680c0a0c1670de44da29f12
author Yi-Yo Chiang <yochiang@google.com> Fri Aug 04 03:31:33 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 04 03:31:33 2023 +0000
tree bea3d9a1be501427049f489776d34a0ad9cb5cfa
parent c8ce6347db19e39616bf5291b5e9b6b03ab92b30
parent 59442132d1c16b0350aa70ec56684d4605a06bd0

Merge "remount: Replace ServiceManager::getService with checkService" into main

fs_mgr/fs_mgr_remount.cpp

diff --git a/fs_mgr/fs_mgr_remount.cpp b/fs_mgr/fs_mgr_remount.cpp
index 4c45828..4b3a5d3 100644
--- a/fs_mgr/fs_mgr_remount.cpp
+++ b/fs_mgr/fs_mgr_remount.cpp
@@ -128,12 +128,11 @@
 }
 
 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);