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

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

Merge "Change error log to fatal when failing to register framework HALs" am:... 

Merge "Change error log to fatal when failing to register framework HALs" am: 7cfb3150 am: d7ddcafe am: 419eb6e4

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

Change-Id: I121ad1eff1e3f195a73c057263ddc16482fa90c6
parents a57a4dd0 419eb6e4

services/core/jni/com_android_server_SystemServer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static void android_server_SystemServer_startHidlServices(JNIEnv* env, jobject / 


    sp<ISensorManager> sensorService = new SensorManager(vm);

    err = sensorService->registerAsService();

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

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



    sp<ISchedulingPolicyService> schedulingService = new SchedulingPolicyService();

    if (IServiceManager::Transport::HWBINDER ==
@@ -91,7 +91,7 @@ static void android_server_SystemServer_startHidlServices(JNIEnv* env, jobject / 


    sp<IStats> statsHal = new StatsHal();

    err = statsHal->registerAsService();

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

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

}



static void android_server_SystemServer_initZygoteChildHeapProfiling(JNIEnv* /* env */,