From 14aee306254b9d06f481ea26a1008ac2bb67fac1 Mon Sep 17 00:00:00 2001 From: Joy Babafemi Date: Tue, 24 Aug 2021 18:03:52 +0000 Subject: [PATCH] Initialize UwbManager only if supported on device. Test: Manual Bug: 197519749 Change-Id: I8346f4c2f3e3cc52e21a9214ab3fd428180c5d8d Merged-In: I8346f4c2f3e3cc52e21a9214ab3fd428180c5d8d --- src/com/android/settings/uwb/UwbPreferenceController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/uwb/UwbPreferenceController.java b/src/com/android/settings/uwb/UwbPreferenceController.java index 15979b510cf..877c9f2f2b4 100644 --- a/src/com/android/settings/uwb/UwbPreferenceController.java +++ b/src/com/android/settings/uwb/UwbPreferenceController.java @@ -57,7 +57,9 @@ public class UwbPreferenceController extends TogglePreferenceController implemen 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() {