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

2020-02-19 03:47:34 +00:00
parent 58b2432d03 1676bec234
commit 0f5f337f6c
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/view/autofill/AutofillManager.java
+++ b/core/java/android/view/autofill/AutofillManager.java
@@ -1794,6 +1794,9 @@ public final class AutofillManager {
            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);
        }
    }