diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-12 08:38:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-12 08:38:35 +0000 |
| commit | 7d77f1e7d2cfde2b832af2b8dd72d2702b770659 (patch) | |
| tree | d9f89bd1c8a2f3bd5a6ec9ace92315dd212496f2 /services/autofill | |
| parent | fc9c75314541091d88aa67c4007ebe8eb073d5d2 (diff) | |
| parent | 906ec8897e2e3dd2c04d137a97cb4c1b01aedbed (diff) | |
Merge "Fix "null" toast when FillCallback.onFailure(null) called." into rvc-qpr-dev am: 906ec8897e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12279991
Change-Id: I63f90c2cd18af251b645e5484c29a07dbb81ee94
Diffstat (limited to 'services/autofill')
| -rw-r--r-- | services/autofill/java/com/android/server/autofill/RemoteFillService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/autofill/java/com/android/server/autofill/RemoteFillService.java b/services/autofill/java/com/android/server/autofill/RemoteFillService.java index 5a9320f61b38..b0755ac836e0 100644 --- a/services/autofill/java/com/android/server/autofill/RemoteFillService.java +++ b/services/autofill/java/com/android/server/autofill/RemoteFillService.java @@ -161,8 +161,9 @@ final class RemoteFillService extends ServiceConnector.Impl<IAutoFillService> { @Override public void onFailure(int requestId, CharSequence message) { + String errorMessage = message == null ? "" : String.valueOf(message); fillRequest.completeExceptionally( - new RuntimeException(String.valueOf(message))); + new RuntimeException(errorMessage)); } }); return fillRequest; |