Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0760ae9c authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Merge "Prepare for Sensorservice HIDL being deprecated" am: 14e32e17 am: c0032ae4 

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



Change-Id: I1fe31852eeaa655ce8f9e96e7aaa335801f5d401
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4d520ea9 c0032ae4

services/core/jni/com_android_server_SystemServer.cpp

+7 −2
Original line number Diff line number Diff line
@@ -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);

    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 ==