commit 14aee306254b9d06f481ea26a1008ac2bb67fac1
author Joy Babafemi <jbabs@google.com> Tue Aug 24 18:03:52 2021 +0000
committer Joy Babafemi <jbabs@google.com> Thu Aug 26 20:26:11 2021 +0000
tree 5dbc377febe3e22e462f0ec4774948bed3979f75
parent 2a87acf2473a1dfd5c5d031904c33f407b8c7806

Initialize UwbManager only if supported on device.

Test: Manual
Bug: 197519749
Change-Id: I8346f4c2f3e3cc52e21a9214ab3fd428180c5d8d
Merged-In: I8346f4c2f3e3cc52e21a9214ab3fd428180c5d8d

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 15979b5..877c9f2 100644
--- a/src/com/android/settings/uwb/UwbPreferenceController.java
+++ b/src/com/android/settings/uwb/UwbPreferenceController.java
@@ -57,7 +57,9 @@
     public UwbPreferenceController(Context context, String key) {
         super(context, key);
         mExecutor = Executors.newSingleThreadExecutor();
-        mUwbManager = context.getSystemService(UwbManager.class);
+        if (isUwbSupportedOnDevice()) {
+            mUwbManager = context.getSystemService(UwbManager.class);
+        }
         mAirplaneModeOn = Settings.Global.getInt(mContext.getContentResolver(),
                 Settings.Global.AIRPLANE_MODE_ON, 0) == 1;
         mAirplaneModeChangedReceiver = new BroadcastReceiver() {