commit 029b6397a804645b424dae42164fa39d6fa2788e
author Victor Liu <victorliu@google.com> Fri Aug 27 01:57:14 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 27 01:57:14 2021 +0000
tree de187c9254d0d87b4679dbaf79192283b0dc2c64
parent 989edd731d8b8b97b708ba8494fef14ea8a09f62
parent 14aee306254b9d06f481ea26a1008ac2bb67fac1

Merge "Initialize UwbManager only if supported on device." into sc-qpr1-dev

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() {