commit b438a9f8ebc3c3f7d57d147e1f672ce19443eaef
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Aug 02 17:17:50 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 02 17:17:50 2022 +0000
tree 6176a3d9fae7bb21a4215d271122f72f8654529b
parent e1a89478eceb332a36dbe3ade37aad9630a652b0
parent d11bade4e5d7b7818090d775f0bb4dea9d719206

Merge "SF: build with ANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION"

libs/binder/Binder.cpp

diff --git a/libs/binder/Binder.cpp b/libs/binder/Binder.cpp
index 2541265..b5ea60f 100644
--- a/libs/binder/Binder.cpp
+++ b/libs/binder/Binder.cpp
@@ -620,12 +620,14 @@
         if (isInheritRt()) {
              ALOGW("Binder %p destroyed after setInheritRt before being parceled.", this);
         }
+#ifdef __linux__
         if (getMinSchedulerPolicy() != SCHED_NORMAL) {
              ALOGW("Binder %p destroyed after setMinSchedulerPolicy before being parceled.", this);
         }
         if (getMinSchedulerPriority() != 0) {
              ALOGW("Binder %p destroyed after setMinSchedulerPolicy before being parceled.", this);
         }
+#endif // __linux__
     }
 
     Extras* e = mExtras.load(std::memory_order_relaxed);

services/inputflinger/UnwantedInteractionBlocker.cpp

diff --git a/services/inputflinger/UnwantedInteractionBlocker.cpp b/services/inputflinger/UnwantedInteractionBlocker.cpp
index 2193b7c..fcb7bec 100644
--- a/services/inputflinger/UnwantedInteractionBlocker.cpp
+++ b/services/inputflinger/UnwantedInteractionBlocker.cpp
@@ -68,8 +68,8 @@
 static bool isPalmRejectionEnabled() {
     std::string value = toLower(
             server_configurable_flags::GetServerConfigurableFlag(INPUT_NATIVE_BOOT,
-                                                                 PALM_REJECTION_ENABLED, "false"));
-    if (value == "true" || value == "1") {
+                                                                 PALM_REJECTION_ENABLED, "0"));
+    if (value == "1") {
         return true;
     }
     return false;