Merge "Prepare for Sensorservice HIDL being deprecated" am: 14e32e179e am: c0032ae469 am: 0760ae9ca8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2242346

Change-Id: I3d057ce22d0ad4b140d48f1a964eaa2410e31404
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Devin Moore
2022-10-18 18:04:03 +00:00
committed by Automerger Merge Worker

View File

@@ -109,8 +109,13 @@ static void android_server_SystemServer_startHidlServices(JNIEnv* env, jobject /
LOG_ALWAYS_FATAL_IF(env->GetJavaVM(&vm) != JNI_OK, "Cannot get Java VM");
sp<ISensorManager> sensorService = new SensorManager(vm);
err = sensorService->registerAsService();
LOG_ALWAYS_FATAL_IF(err != OK, "Cannot register %s: %d", ISensorManager::descriptor, err);
if (IServiceManager::Transport::HWBINDER ==
hardware::defaultServiceManager1_2()->getTransport(ISensorManager::descriptor, "default")) {
err = sensorService->registerAsService();
LOG_ALWAYS_FATAL_IF(err != OK, "Cannot register %s: %d", ISensorManager::descriptor, err);
} else {
ALOGW("%s is deprecated. Skipping registration.", ISensorManager::descriptor);
}
sp<ISchedulingPolicyService> schedulingService = new SchedulingPolicyService();
if (IServiceManager::Transport::HWBINDER ==