Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da15cbb5 authored by Victor Liu's avatar Victor Liu Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: If9a8aba1e56a75422b0c2a453673d0cd873d4aa1
parents 1d35b1cd 029b6397

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

+3 −1
Original line number Diff line number Diff line
@@ -57,7 +57,9 @@ public class UwbPreferenceController extends TogglePreferenceController implemen 
    public UwbPreferenceController(Context context, String key) {

        super(context, key);

        mExecutor = Executors.newSingleThreadExecutor();

        if (isUwbSupportedOnDevice()) {

            mUwbManager = context.getSystemService(UwbManager.class);

        }

        mAirplaneModeOn = Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.AIRPLANE_MODE_ON, 0) == 1;

        mAirplaneModeChangedReceiver = new BroadcastReceiver() {