Fix Java null pointer exception

flutter · Oct 27, 2023 · 17395ad · 17395ad
1 parent fd13af5
commit 17395ad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/web_ui/test/engine/keyboard_converter_test.dart b/lib/web_ui/test/engine/keyboard_converter_test.dart
@@ -61,7 +61,7 @@ void testMain() {
       character: 'A',
       timeStamp: Duration.zero,
       synthesized: false,
-    ).toString(), 'KeyData(type: down, physical: 0x700e5, logical: 0x61 (Unicode), character: "A" (0x41))');
+    ).toString(), 'KeyData(Down, physical: 0x700e5, logical: 0x61 (Unicode), character: "A" (0x41))');
 
     expect(const ui.KeyData(
       type: ui.KeyEventType.up,
@@ -71,7 +71,7 @@ void testMain() {
       character: '\n',
       timeStamp: Duration.zero,
       synthesized: true,
-    ).toString(), r'KeyData(type: up, physical: 0x700e6, logical: 0x100000061 (Unprintable), character: "\n" (0x0a), synthesized)');
+    ).toString(), r'KeyData(Up, physical: 0x700e6, logical: 0x100000061 (Unprintable), character: "\n" (0x0a), synthesized)');
 
     expect(const ui.KeyData(
       type: ui.KeyEventType.repeat,
@@ -81,7 +81,7 @@ void testMain() {
       character: null,
       timeStamp: Duration.zero,
       synthesized: false,
-    ).toString(), 'KeyData(type: repeat, physical: 0x700e7, logical: 0x9900000071, character: <none>)');
+    ).toString(), 'KeyData(Repeat, physical: 0x700e7, logical: 0x9900000071, character: <none>)');
   });
 
   test('Single key press, repeat, and release', () {

diff --git a/shell/platform/android/io/flutter/embedding/android/KeyEmbedderResponder.java b/shell/platform/android/io/flutter/embedding/android/KeyEmbedderResponder.java
@@ -368,6 +368,7 @@ private boolean handleEventImpl(
     output.physicalKey = physicalKey;
     output.character = character;
     output.synthesized = false;
+    output.deviceType = KeyData.DeviceType.kKeyboard;
 
     sendKeyEvent(output, onKeyEventHandledCallback);
     for (final Runnable postSyncEvent : postSynchronizeEvents) {
@@ -384,6 +385,7 @@ private void synthesizeEvent(boolean isDown, Long logicalKey, Long physicalKey,
     output.physicalKey = physicalKey;
     output.character = null;
     output.synthesized = true;
+    output.deviceType = KeyData.DeviceType.kKeyboard;
     if (physicalKey != 0 && logicalKey != 0) {
       updatePressingState(physicalKey, isDown ? logicalKey : null);
     }