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

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

Merge "system_server: Add log for skipping registration of framework service" am: ddfa4636 

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

Change-Id: I75d6f44705862993de2922803c143c850af2a4f7
parents 111f4116 ddfa4636

services/core/jni/com_android_server_SystemServer.cpp

+11 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <jni.h>

#include <nativehelper/JNIHelp.h>



#include <android/hidl/manager/1.2/IServiceManager.h>

#include <binder/IServiceManager.h>

#include <hidl/HidlTransportSupport.h>

#include <incremental_service.h>
@@ -64,6 +65,7 @@ static void android_server_SystemServer_startHidlServices(JNIEnv* env, jobject / 
    using ::android::frameworks::stats::V1_0::IStats;

    using ::android::frameworks::stats::V1_0::implementation::StatsHal;

    using ::android::hardware::configureRpcThreadpool;

    using ::android::hidl::manager::V1_0::IServiceManager;



    status_t err;
@@ -77,8 +79,15 @@ static void android_server_SystemServer_startHidlServices(JNIEnv* env, jobject / 
    ALOGE_IF(err != OK, "Cannot register %s: %d", ISensorManager::descriptor, err);



    sp<ISchedulingPolicyService> schedulingService = new SchedulingPolicyService();

    err = schedulingService->registerAsService();

    ALOGE_IF(err != OK, "Cannot register %s: %d", ISchedulingPolicyService::descriptor, err);

    if (IServiceManager::Transport::HWBINDER ==

        hardware::defaultServiceManager1_2()->getTransport(ISchedulingPolicyService::descriptor,

                                                           "default")) {

        err = schedulingService->registerAsService("default");

        LOG_ALWAYS_FATAL_IF(err != OK, "Cannot register %s: %d",

                            ISchedulingPolicyService::descriptor, err);

    } else {

        ALOGW("%s is deprecated. Skipping registration.", ISchedulingPolicyService::descriptor);

    }



    sp<IStats> statsHal = new StatsHal();

    err = statsHal->registerAsService();