From adaeb93dfc8841c0842c470b575bcc332e25f225 Mon Sep 17 00:00:00 2001
From: Greg Spencer <gspencer@google.com>
Date: Fri, 27 Oct 2023 14:00:34 -0700
Subject: [PATCH] Fix Java null pointer exception

---
 .../io/flutter/embedding/android/KeyEmbedderResponder.java      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/shell/platform/android/io/flutter/embedding/android/KeyEmbedderResponder.java b/shell/platform/android/io/flutter/embedding/android/KeyEmbedderResponder.java
index d8e0e49c1ce3a..ed23adac1d24f 100644
--- 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);
     }