From 1676bec2341ab49ff0b697ecc332dde5d7b7dcfb Mon Sep 17 00:00:00 2001
From: Joanne Chung <joannechung@google.com>
Date: Wed, 12 Feb 2020 11:36:30 +0800
Subject: [PATCH] Prevent crash app when AutofillManager#startSessionLocked()
 is called

Bug: 141165119
Test: atest CtsAutoFillServiceTestCases
Test: manual. Install sample app in bug and make sure app does not
crash and log error after applying the fix.

Change-Id: If61553126b694a0d520691a963f728cb46cb521d
---
 core/java/android/view/autofill/AutofillManager.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/java/android/view/autofill/AutofillManager.java b/core/java/android/view/autofill/AutofillManager.java
index c159f89cf2ac5..15e3e4a27edff 100644
--- a/core/java/android/view/autofill/AutofillManager.java
+++ b/core/java/android/view/autofill/AutofillManager.java
@@ -1793,6 +1793,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);
         }
     }