commit 0f5f337f6c5f79c759a01933f2e040e8ea81a5b7
author Joanne Chung <joannechung@google.com> Wed Feb 19 03:47:34 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 19 03:47:34 2020 +0000
tree e40cd7ca3929c87681f8e4bbf6bc7b0c1bfe66b5
parent 58b2432d039239deb976f2ddda3fe9a68645d2dc
parent 1676bec2341ab49ff0b697ecc332dde5d7b7dcfb

Merge "Prevent crash app when AutofillManager#startSessionLocked() is called"

core/java/android/view/autofill/AutofillManager.java

diff --git a/core/java/android/view/autofill/AutofillManager.java b/core/java/android/view/autofill/AutofillManager.java
index 54bdb88..ce7cfa7 100644
--- a/core/java/android/view/autofill/AutofillManager.java
+++ b/core/java/android/view/autofill/AutofillManager.java
@@ -1794,6 +1794,9 @@
             client.autofillClientResetableStateAvailable();
         } catch (RemoteException e) {
             throw e.rethrowFromSystemServer();
+        } catch (SyncResultReceiver.TimeoutException e) {
+            // no-op, just log the error message.
+            Log.w(TAG, "Exception getting result from SyncResultReceiver: " + e);
         }
     }