From 2094f4d89eb5698bbee5ce40a07b400fcdd1f350 Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Tue, 11 Jan 2022 13:16:16 -0500
Subject: [PATCH] Fix NPE in onTrustError method

Test: manual
Fixes: 213630529
Change-Id: I57fb3a4a0e8a90a35534633e233ae374ad69fffa
---
 core/java/android/app/trust/TrustManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/app/trust/TrustManager.java b/core/java/android/app/trust/TrustManager.java
index 65b2775fd66bd..177de835554bf 100644
--- a/core/java/android/app/trust/TrustManager.java
+++ b/core/java/android/app/trust/TrustManager.java
@@ -156,7 +156,7 @@ public class TrustManager {
 
                 @Override
                 public void onTrustError(CharSequence message) {
-                    Message m = mHandler.obtainMessage(MSG_TRUST_ERROR);
+                    Message m = mHandler.obtainMessage(MSG_TRUST_ERROR, trustListener);
                     m.getData().putCharSequence(DATA_MESSAGE, message);
                     m.sendToTarget();
                 }