From ca7623eb39d74a8cbdd095fcc7db398267b6928f Mon Sep 17 00:00:00 2001
From: Jason Simmons <jason-simmons@users.noreply.github.com>
Date: Fri, 29 Mar 2019 17:15:04 -0700
Subject: [PATCH] Handle null values in TextInputConfiguration.actionLabel JSON
 (#8377)

Fixes https://github.com/flutter/flutter/issues/29798
---
 .../embedding/engine/systemchannels/TextInputChannel.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/platform/android/io/flutter/embedding/engine/systemchannels/TextInputChannel.java b/shell/platform/android/io/flutter/embedding/engine/systemchannels/TextInputChannel.java
index b23d33fd009..728ae407977 100644
--- a/shell/platform/android/io/flutter/embedding/engine/systemchannels/TextInputChannel.java
+++ b/shell/platform/android/io/flutter/embedding/engine/systemchannels/TextInputChannel.java
@@ -242,7 +242,7 @@ public class TextInputChannel {
           TextCapitalization.fromValue(json.getString("textCapitalization")),
           InputType.fromJson(json.getJSONObject("inputType")),
           inputAction,
-          json.optString("actionLabel")
+          json.isNull("actionLabel") ? null : json.getString("actionLabel")
       );
     }