commit 959b7be463d5e06968f6709a7cc62418526fc851
author Ankit Siddhapura <ankit.siddhapura@siliconsignals.io> Tue Apr 16 13:07:42 2024 +0530
committer Ankit Siddhapura <ankit.siddhapura@siliconsignals.io> Wed Jul 31 16:23:41 2024 +0530
tree 302738854eb14410099764d560b118974e84681f
parent db12f54916d98780bc40f68a73bf49ac453fef1c

ACameraManager: remove get camera service loop

Removed do..while loop to avoid waiting indefinitely if cameraservice is missing.
Replace deprecated getService with checkService.

Bug: 356418723
Change-Id: I3adf4f8faee7c32541bb75f1d597bfabb153356d

camera/ndk/impl/ACameraManager.cpp

diff --git a/camera/ndk/impl/ACameraManager.cpp b/camera/ndk/impl/ACameraManager.cpp
index 8c3424f..0bcceaf 100644
--- a/camera/ndk/impl/ACameraManager.cpp
+++ b/camera/ndk/impl/ACameraManager.cpp
@@ -84,14 +84,11 @@
 
         sp<IServiceManager> sm = defaultServiceManager();
         sp<IBinder> binder;
-        do {
-            binder = sm->getService(toString16(kCameraServiceName));
-            if (binder != nullptr) {
-                break;
-            }
-            ALOGW("CameraService not published, waiting...");
-            usleep(kCameraServicePollDelay);
-        } while(true);
+        binder = sm->checkService(String16(kCameraServiceName));
+        if (binder == nullptr) {
+            ALOGE("%s: Could not get CameraService instance.", __FUNCTION__);
+            return nullptr;
+        }
         if (mDeathNotifier == nullptr) {
             mDeathNotifier = new DeathNotifier(this);
         }