summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tim Yu <yunicorn@google.com> 2024-11-05 21:37:36 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-11-05 21:37:36 +0000
commit553c39b0e3f8db21c6a23c00b262dd8dbd172ce8 (patch)
treefed699195d7919eb3d1c6a9f10b09700aee1fcd1
parent6e8e43e664ffeda0690773dfdd90e23bf6ffed01 (diff)
parent1969fb567337b71bafa9f0e89740025b31c0aa02 (diff)
Merge "Add null check for mCallback in AutoFillUI" into main
-rw-r--r--services/autofill/java/com/android/server/autofill/ui/AutoFillUI.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/services/autofill/java/com/android/server/autofill/ui/AutoFillUI.java b/services/autofill/java/com/android/server/autofill/ui/AutoFillUI.java
index 2e9a4dcb45aa..a10039f9bf6c 100644
--- a/services/autofill/java/com/android/server/autofill/ui/AutoFillUI.java
+++ b/services/autofill/java/com/android/server/autofill/ui/AutoFillUI.java
@@ -462,7 +462,9 @@ public final class AutoFillUI {
@Override
public void onShown() {
- mCallback.onShown(UI_TYPE_DIALOG, response.getDatasets().size());
+ if (mCallback != null) {
+ mCallback.onShown(UI_TYPE_DIALOG, response.getDatasets().size());
+ }
}
@Override
@@ -511,7 +513,9 @@ public final class AutoFillUI {
@Override
public void startIntentSender(IntentSender intentSender) {
- mCallback.startIntentSenderAndFinishSession(intentSender);
+ if (mCallback != null) {
+ mCallback.startIntentSenderAndFinishSession(intentSender);
+ }
}
private void log(int type) {