commit d24f4a3f54573a2b2562c6f98a6fb0d73c40612c
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 07 00:41:43 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 07 00:41:43 2022 +0000
tree e2766b6d30441d25cf71e0caade67215b7d50f97
parent a4915b26f47107df3b4a90283a7c7c7ca04278b2
parent a9c6040eb8a9647c03b5063b53d7266780dbf0b4

Merge "Fix NPE crash in UwbPreferenceController and optimize the lifecycle observer adding condition in page" am: b2a466d92f am: a9c6040eb8

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2206258

Change-Id: I3048482c0e9c74bc4488fb76e7166b4e94bf1e98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java

diff --git a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
index b58d9c3..e2d92c7 100644
--- a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
@@ -69,8 +69,12 @@
     public void onAttach(Context context) {
         super.onAttach(context);
         UwbPreferenceController uwbPreferenceController = use(UwbPreferenceController.class);
-        if (uwbPreferenceController != null && getSettingsLifecycle() != null) {
-            getSettingsLifecycle().addObserver(uwbPreferenceController);
+        // We only need the observer listen to the broadcast in the background for refreshing
+        // UI if the device supports UWB.
+        if (uwbPreferenceController != null && uwbPreferenceController.isUwbSupportedOnDevice()) {
+            if (getSettingsLifecycle() != null) {
+                getSettingsLifecycle().addObserver(uwbPreferenceController);
+            }
         }
     }
 

src/com/android/settings/uwb/UwbPreferenceController.java

diff --git a/src/com/android/settings/uwb/UwbPreferenceController.java b/src/com/android/settings/uwb/UwbPreferenceController.java
index ad040ed..fb0836d 100644
--- a/src/com/android/settings/uwb/UwbPreferenceController.java
+++ b/src/com/android/settings/uwb/UwbPreferenceController.java
@@ -75,8 +75,7 @@
         };
     }
 
-    @VisibleForTesting
-    boolean isUwbSupportedOnDevice() {
+    public boolean isUwbSupportedOnDevice() {
         return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_UWB);
     }
 
@@ -99,6 +98,9 @@
 
     @Override
     public boolean isChecked() {
+        if (!isUwbSupportedOnDevice()) {
+            return false;
+        }
         int state = mUwbManager.getAdapterState();
         return state == STATE_ENABLED_ACTIVE || state == STATE_ENABLED_INACTIVE;
     }