commit 7cfb31506e80caa47a30d465924d1de635dade9d
author Devin Moore <devinmoore@google.com> Wed Oct 21 16:57:34 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 21 16:57:34 2020 +0000
tree 82750556bcbcaebae894494b5ab122187eae0def
parent ddfa46368e98dc27d78cdcf488acb960bbfc2cfd
parent b90e1e38fedf4573b479e1ade6c26b4db9b7b4e0

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

services/core/jni/com_android_server_SystemServer.cpp

diff --git a/services/core/jni/com_android_server_SystemServer.cpp b/services/core/jni/com_android_server_SystemServer.cpp
index f7567b1..43f50bf 100644
--- a/services/core/jni/com_android_server_SystemServer.cpp
+++ b/services/core/jni/com_android_server_SystemServer.cpp
@@ -76,7 +76,7 @@
 
     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 @@
 
     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 */,