Merge "Prepare for Sensorservice HIDL being deprecated" am: 14e32e179e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2242346 Change-Id: I61ad7c1ad316163c2719cd127d32980e2f4fb277 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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");
|
LOG_ALWAYS_FATAL_IF(env->GetJavaVM(&vm) != JNI_OK, "Cannot get Java VM");
|
||||||
|
|
||||||
sp<ISensorManager> sensorService = new SensorManager(vm);
|
sp<ISensorManager> sensorService = new SensorManager(vm);
|
||||||
|
if (IServiceManager::Transport::HWBINDER ==
|
||||||
|
hardware::defaultServiceManager1_2()->getTransport(ISensorManager::descriptor, "default")) {
|
||||||
err = sensorService->registerAsService();
|
err = sensorService->registerAsService();
|
||||||
LOG_ALWAYS_FATAL_IF(err != OK, "Cannot register %s: %d", ISensorManager::descriptor, err);
|
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();
|
sp<ISchedulingPolicyService> schedulingService = new SchedulingPolicyService();
|
||||||
if (IServiceManager::Transport::HWBINDER ==
|
if (IServiceManager::Transport::HWBINDER ==
|
||||||
|
|||||||
Reference in New Issue
Block a user