From 6c7bd9109d05c819b0f61060bcbea9bcfba6a56a Mon Sep 17 00:00:00 2001
From: Haijie Hong <hahong@google.com>
Date: Thu, 2 Jan 2025 16:51:59 +0800
Subject: [PATCH] Don't update UI if getActivity returns null

Flag: EXEMPT minor fix
Test: local test
Bug: 383016400
Change-Id: I4d62da1a6d74db18f2c7cd20eb2e5b3825556fc5
---
 .../settings/bluetooth/BluetoothDeviceDetailsFragment.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
index 403a82429cc..450657e6416 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
@@ -136,7 +136,8 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment
             (device, key, value) -> {
                 if (key == METADATA_FAST_PAIR_CUSTOMIZED_FIELDS
                         && mExtraControlViewWidth > 0
-                        && !mExtraControlUriLoaded) {
+                        && !mExtraControlUriLoaded
+                        && getActivity() != null) {
                     Log.i(TAG, "Update extra control UI because of metadata change.");
                     updateExtraControlUri(mExtraControlViewWidth);
                 }