diff options
| author | 2024-05-10 17:24:06 -0700 | |
|---|---|---|
| committer | 2024-05-10 18:07:38 -0700 | |
| commit | b58c0c31025bc458204f35ae11f8b343535d27c6 (patch) | |
| tree | aea9c90a901773be84592ae29db414f343f2fbf7 /libs/input/KeyCharacterMap.cpp | |
| parent | 870f4e7e579658f03b5c09a9928d35830bb7986f (diff) | |
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
Diffstat (limited to 'libs/input/KeyCharacterMap.cpp')
| -rw-r--r-- | libs/input/KeyCharacterMap.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libs/input/KeyCharacterMap.cpp b/libs/input/KeyCharacterMap.cpp index 41909bfb2d..f75bf410f2 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 @@ void KeyCharacterMap::addLockedMetaKey(Vector<KeyEvent>& outEvents, } } -#ifdef __linux__ std::unique_ptr<KeyCharacterMap> KeyCharacterMap::readFromParcel(Parcel* parcel) { if (parcel == nullptr) { ALOGE("%s: Null parcel", __func__); @@ -744,7 +741,6 @@ void KeyCharacterMap::writeToParcel(Parcel* parcel) const { parcel->writeInt32(toAndroidKeyCode); } } -#endif // __linux__ // --- KeyCharacterMap::Parser --- |