PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up settings subsequent pairing aconfig flag" into main

Browse Source
This commit is contained in:
Haijie Hong
2024-08-29 05:30:34 +00:00
committed by Android (Google) Code Review
parent 053bbbbd40 dc68fd4253
commit cafb920cdd
6 changed files with 10 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/connecteddevice/fastpair/FastPairDevicePreferenceController.java
View File

@@ -34,7 +34,6 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.connecteddevice.DevicePreferenceCallback;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.flags.Flags;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.utils.ThreadUtils;
@@ -76,15 +75,10 @@ public class FastPairDevicePreferenceController extends BasePreferenceController
public FastPairDevicePreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
if (Flags.enableSubsequentPairSettingsIntegration()) {
FastPairFeatureProvider fastPairFeatureProvider =
FeatureFactory.getFeatureFactory().getFastPairFeatureProvider();
mFastPairDeviceUpdater =
fastPairFeatureProvider.getFastPairDeviceUpdater(context, this);
} else {
Log.d(TAG, "Flag disabled. Ignore.");
mFastPairDeviceUpdater = null;
}
FastPairFeatureProvider fastPairFeatureProvider =
FeatureFactory.getFeatureFactory().getFastPairFeatureProvider();
mFastPairDeviceUpdater =
fastPairFeatureProvider.getFastPairDeviceUpdater(context, this);
mIntentFilter = new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED);
mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
}