Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Devin Moore
2020-10-21 15:41:34 +00:00
committed by Gerrit Code Review
parent 8fafabfed1 ad33143837
commit ddfa46368e
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/jni/com_android_server_SystemServer.cpp
View File

@@ -23,6 +23,7 @@
#include <jni.h> #include <jni.h>
#include <nativehelper/JNIHelp.h> #include <nativehelper/JNIHelp.h>
#include <android/hidl/manager/1.2/IServiceManager.h>
#include <binder/IServiceManager.h> #include <binder/IServiceManager.h>
#include <hidl/HidlTransportSupport.h> #include <hidl/HidlTransportSupport.h>
#include <incremental_service.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::IStats;
using ::android::frameworks::stats::V1_0::implementation::StatsHal; using ::android::frameworks::stats::V1_0::implementation::StatsHal;
using ::android::hardware::configureRpcThreadpool; using ::android::hardware::configureRpcThreadpool;
using ::android::hidl::manager::V1_0::IServiceManager;
status_t err; 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); ALOGE_IF(err != OK, "Cannot register %s: %d", ISensorManager::descriptor, err);
sp<ISchedulingPolicyService> schedulingService = new SchedulingPolicyService(); sp<ISchedulingPolicyService> schedulingService = new SchedulingPolicyService();
err = schedulingService->registerAsService(); if (IServiceManager::Transport::HWBINDER ==
ALOGE_IF(err != OK, "Cannot register %s: %d", ISchedulingPolicyService::descriptor, err); 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(); sp<IStats> statsHal = new StatsHal();
err = statsHal->registerAsService(); err = statsHal->registerAsService();