Merge "Fix "null" toast when FillCallback.onFailure(null) called." into rvc-qpr-dev

2020-08-12 08:25:50 +00:00
parent b8f93d34ae fe89715c86
commit 906ec8897e
1 changed files with 2 additions and 1 deletions
--- 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;