commit b58c0c31025bc458204f35ae11f8b343535d27c6
author Siarhei Vishniakou <svv@google.com> Fri May 10 17:24:06 2024 -0700
committer Siarhei Vishniakou <svv@google.com> Fri May 10 18:07:38 2024 -0700
tree aea9c90a901773be84592ae29db414f343f2fbf7
parent 870f4e7e579658f03b5c09a9928d35830bb7986f

Remove __linux__ ifdefs where not needed

The downstream branches now know about Parcel and binder, so in some
places, these #ifdef statements are not needed.

This CL should help reduce the divergence with downstream efforts. See
the merge conflict resolution CL as an example:
https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/native/+/27201796/-2..3

Bug: 309829647
Test: presubmit
Change-Id: Iec17cface5069ca79a565c205546db8ada8a07ee

libs/input/Input.cpp

diff --git a/libs/input/Input.cpp b/libs/input/Input.cpp
index d271563..1178d02 100644
--- a/libs/input/Input.cpp
+++ b/libs/input/Input.cpp
@@ -32,9 +32,7 @@
 #include <input/InputDevice.h>
 #include <input/InputEventLabels.h>
 
-#ifdef __linux__
 #include <binder/Parcel.h>
-#endif
 #if defined(__ANDROID__)
 #include <sys/random.h>
 #endif
@@ -483,7 +481,6 @@
     scaleAxisValue(*this, AMOTION_EVENT_AXIS_RELATIVE_Y, windowYScale);
 }
 
-#ifdef __linux__
 status_t PointerCoords::readFromParcel(Parcel* parcel) {
     bits = parcel->readInt64();
 
@@ -511,7 +508,6 @@
     parcel->writeBool(isResampled);
     return OK;
 }
-#endif
 
 void PointerCoords::tooManyAxes(int axis) {
     ALOGW("Could not set value for axis %d because the PointerCoords structure is full and "
@@ -801,7 +797,6 @@
     }
 }
 
-#ifdef __linux__
 static status_t readFromParcel(ui::Transform& transform, const Parcel& parcel) {
     float dsdx, dtdx, tx, dtdy, dsdy, ty;
     status_t status = parcel.readFloat(&dsdx);
@@ -948,7 +943,6 @@
     }
     return OK;
 }
-#endif
 
 bool MotionEvent::isTouchEvent(uint32_t source, int32_t action) {
     if (isFromSource(source, AINPUT_SOURCE_CLASS_POINTER)) {

libs/input/KeyCharacterMap.cpp

diff --git a/libs/input/KeyCharacterMap.cpp b/libs/input/KeyCharacterMap.cpp
index 41909bf..f75bf41 100644
--- a/libs/input/KeyCharacterMap.cpp
+++ b/libs/input/KeyCharacterMap.cpp
@@ -19,11 +19,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef __linux__
-#include <binder/Parcel.h>
-#endif
 #include <android/keycodes.h>
 #include <attestation/HmacKeyManager.h>
+#include <binder/Parcel.h>
 #include <input/InputEventLabels.h>
 #include <input/KeyCharacterMap.h>
 #include <input/Keyboard.h>
@@ -611,7 +609,6 @@
     }
 }
 
-#ifdef __linux__
 std::unique_ptr<KeyCharacterMap> KeyCharacterMap::readFromParcel(Parcel* parcel) {
     if (parcel == nullptr) {
         ALOGE("%s: Null parcel", __func__);
@@ -744,7 +741,6 @@
         parcel->writeInt32(toAndroidKeyCode);
     }
 }
-#endif // __linux__
 
 // --- KeyCharacterMap::Parser ---