From 0c624eac63a63119c1290922e35ad253f830d431 Mon Sep 17 00:00:00 2001
From: Dylan Roeh <droeh@mozilla.com>
Date: Tue, 18 Aug 2015 08:43:50 -0500
Subject: [PATCH] Bug 860305 - Catch possible RuntimeException in
 GeckoInputConnection.restartInput. r=snorp

---
 mobile/android/base/GeckoInputConnection.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mobile/android/base/GeckoInputConnection.java b/mobile/android/base/GeckoInputConnection.java
index ce4bc57251b0..1e4d5ff2d64c 100644
--- a/mobile/android/base/GeckoInputConnection.java
+++ b/mobile/android/base/GeckoInputConnection.java
@@ -402,7 +402,11 @@ class GeckoInputConnection
             // reasonable, deterministic value
             notifySelectionChange(-1, -1);
         }
-        imm.restartInput(v);
+        try {
+            imm.restartInput(v);
+        } catch(RuntimeException e) {
+            Log.e(LOGTAG, "Error restarting input", e);
+        }
     }
 
     private void resetInputConnection() {