Merge "Initialize UwbManager only if supported on device." into sc-qpr1-dev am: 029b6397a8

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

Change-Id: If9a8aba1e56a75422b0c2a453673d0cd873d4aa1
This commit is contained in:
Victor Liu
2021-08-27 02:14:01 +00:00
committed by Automerger Merge Worker

View File

@@ -57,7 +57,9 @@ public class UwbPreferenceController extends TogglePreferenceController implemen
public UwbPreferenceController(Context context, String key) { public UwbPreferenceController(Context context, String key) {
super(context, key); super(context, key);
mExecutor = Executors.newSingleThreadExecutor(); mExecutor = Executors.newSingleThreadExecutor();
mUwbManager = context.getSystemService(UwbManager.class); if (isUwbSupportedOnDevice()) {
mUwbManager = context.getSystemService(UwbManager.class);
}
mAirplaneModeOn = Settings.Global.getInt(mContext.getContentResolver(), mAirplaneModeOn = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.AIRPLANE_MODE_ON, 0) == 1; Settings.Global.AIRPLANE_MODE_ON, 0) == 1;
mAirplaneModeChangedReceiver = new BroadcastReceiver() { mAirplaneModeChangedReceiver = new BroadcastReceiver() {