commit 5c84d6004d524fc09811a6f79921e02565ef8065
author Steven Moreland <smoreland@google.com> Thu Apr 22 17:01:53 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 22 17:01:53 2021 +0000
tree d6e99bba1d35ee3a5fffd3643b906681a4973ac2
parent 88cd995432fb803cb02840694e835d1019302c0f
parent ccd2b60c3060332ad634e9fa0e246b61af6f86a0

Merge "Failing to enable oneway spam detection is not an error." am: ccd2b60c30

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1683871

Change-Id: Ib739ea434db51f03246a1b3484416eb76bd936aa

libs/binder/ProcessState.cpp

diff --git a/libs/binder/ProcessState.cpp b/libs/binder/ProcessState.cpp
index ca99042..a2efb1c 100644
--- a/libs/binder/ProcessState.cpp
+++ b/libs/binder/ProcessState.cpp
@@ -362,7 +362,7 @@
 status_t ProcessState::enableOnewaySpamDetection(bool enable) {
     uint32_t enableDetection = enable ? 1 : 0;
     if (ioctl(mDriverFD, BINDER_ENABLE_ONEWAY_SPAM_DETECTION, &enableDetection) == -1) {
-        ALOGE("Binder ioctl to enable oneway spam detection failed: %s", strerror(errno));
+        ALOGI("Binder ioctl to enable oneway spam detection failed: %s", strerror(errno));
         return -errno;
     }
     return NO_ERROR;
@@ -401,7 +401,7 @@
         uint32_t enable = DEFAULT_ENABLE_ONEWAY_SPAM_DETECTION;
         result = ioctl(fd, BINDER_ENABLE_ONEWAY_SPAM_DETECTION, &enable);
         if (result == -1) {
-            ALOGE("Binder ioctl to enable oneway spam detection failed: %s", strerror(errno));
+            ALOGI("Binder ioctl to enable oneway spam detection failed: %s", strerror(errno));
         }
     } else {
         ALOGW("Opening '%s' failed: %s\n", driver, strerror(errno));