Commit 9365d00c authored Aug 04, 2023 by Yi-Yo Chiang Committed by Automerger Merge Worker Aug 04, 2023

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

Merge "remount: Replace ServiceManager::getService with checkService" into main am: 4131a3af am: 18cea8df

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

Change-Id: I677dd4b109cc5a6f0c0be953f0a4d6b17eb7546b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

fs_mgr/fs_mgr_remount.cpp

+4 −5

Original line number	Diff line number	Diff line
		@@ -128,14 +128,13 @@ 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 binder = sm->checkService(android::String16("vold"))) {
		if (auto vold = android::interface_cast<android::os::IVold>(binder)) {
		return vold;
		}
		}
		}
		std::this_thread::sleep_for(2s);
		}
		}