From e4ff8c403ce52a1fa1aad04e1a55cda4353da89e Mon Sep 17 00:00:00 2001
From: Chun Zhang <chunzhang@google.com>
Date: Mon, 24 Mar 2025 14:41:57 +0000
Subject: [PATCH] Check client null before calling and closing.

Bug: 404955994
Test: TreeHugger
Test: manual
Test: atest SafetySourceBroadcastReceiverTest
Test: atest LockScreenSafetySourceTest
Test: atest ActiveUnlockStatusUtilsTest
Test: atest WearSafetySourceTest
Flag: com.android.settings.flags.biometrics_onboarding_education
Change-Id: I34085b90fe41283e484d3b2235426676d886e69c
---
 .../biometrics/activeunlock/ActiveUnlockContentListener.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/android/settings/biometrics/activeunlock/ActiveUnlockContentListener.java b/src/com/android/settings/biometrics/activeunlock/ActiveUnlockContentListener.java
index 42029ff89f1..f9a8e56b3de 100644
--- a/src/com/android/settings/biometrics/activeunlock/ActiveUnlockContentListener.java
+++ b/src/com/android/settings/biometrics/activeunlock/ActiveUnlockContentListener.java
@@ -147,6 +147,9 @@ public class ActiveUnlockContentListener {
             @NonNull String contentKey) {
         ContentResolver contentResolver = context.getContentResolver();
         ContentProviderClient client = contentResolver.acquireContentProviderClient(uri);
+        if (client == null) {
+            return null;
+        }
 
         @Nullable Bundle bundle = null;