[Android] Fix a crash related to zeroed scanCode #35924
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
justinmc
approved these changes
Sep 13, 2022
| @@ -122,7 +122,7 @@ void updatePressingState(@NonNull Long physicalKey, @Nullable Long logicalKey) { | |||
| // the current event in consideration. | |||
| // | |||
| // Events that should be synthesized before the main event are synthesized | |||
| // immediately, while events that should be syntehsized after the main event are appended to | |||
| // immediately, while events that should be synthesized after the main event are appended to | |||
There was a problem hiding this comment.
Thanks for catching that! 😊
|
|
||
| // Test: DOWN event when the current state is 0 and scanCode is 0. | ||
| final KeyEvent keyEvent = new FakeKeyEvent(ACTION_DOWN, 0, KEYCODE_SHIFT_LEFT, 0, '\0', 0); | ||
| // Compute physicalKey in the same way than KeyboardManager.getPhysicalKey |
There was a problem hiding this comment.
"same way than" => "same was as"
And also period at the end.
| @Test | ||
| public void synchronizeModifiersForZeroedScanCode() { | ||
| // Test if ShiftLeft can be correctly synchronized during down events of | ||
| // ShiftLeft that has 0 for its metaState and 0 for its scanCode. |
There was a problem hiding this comment.
If I understand correctly:
"has" => "have"
"its" => "their"
bleroux
force-pushed
the
fix_android_crash_zeroed_scancode
branch
from
d98e78b to
24337ea
Compare
dkwingsmt
reviewed
Sep 13, 2022
| nowStates[keyIdx] = pressingRecords.containsKey(goal.keys[keyIdx].physicalKey); | ||
| if (goal.keys[keyIdx].logicalKey == eventLogicalKey) { | ||
| nowStates[keyIdx] = pressingRecords.containsKey(key.physicalKey); | ||
| if (key.logicalKey == eventLogicalKey) { |
There was a problem hiding this comment.
Just to confirm, are these two lines of change make any difference, or purely cosmetic? (I'm ok with either)
There was a problem hiding this comment.
Purely cosmetic. The 'key' variable was already defined (before this PR) and It could be used on this two lines.
bleroux
added
the
autosubmit
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Sep 14, 2022
Merged
8 tasks
itsjustkevin
pushed a commit
that referenced
this pull request
Sep 20, 2022
…ting text in `TextField` (#36288) * [Android] Synchronize incorrect metaState using post-synchronization (#34827) (cherry picked from commit a56d98e) * [Android] Fix a crash related to zeroed scanCode (#35924) (cherry picked from commit fe5b84a) Co-authored-by: Tong Mu <[email protected]> Co-authored-by: Bruno Leroux <[email protected]>
Oleh-Sv
pushed a commit
to Oleh-Sv/engine
that referenced
this pull request
Sep 28, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
#33686, introduced the Android implementation of the backend of
HardwareKeyboard.#34827 fixed a crash related to incorrect metaState.
This PR fixes another crash related to incorrect metaState and a zeroed scanCode.
Implementation
#34827 synthesizes a key up event when there is a down event with incorrect metaState.
If the scanCode is zeroed the computed physical key codes are not the same (for the down event and the up event) and leads to an incorrect state.
This PR updates how the key up event is synthesized by using the same physical key code (the one in the down event).
Related Issue
Fixes flutter/flutter#110640
Tests
Adds 1 test.