Merge "Trunk Stable/RemoteDevices: Use static flagging" into main (aeaae719) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/btservice/RemoteDevices.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ import com.android.bluetooth.BluetoothStatsLog;
		import com.android.bluetooth.R;
		import com.android.bluetooth.Utils;
		import com.android.bluetooth.bas.BatteryService;
		import com.android.bluetooth.flags.FeatureFlagsImpl;
		import com.android.bluetooth.flags.Flags;
		import com.android.bluetooth.hfp.HeadsetHalConstants;
		import com.android.internal.annotations.VisibleForTesting;

		@@ -70,7 +70,6 @@ public class RemoteDevices {

		private BluetoothAdapter mAdapter;
		private AdapterService mAdapterService;
		private FeatureFlagsImpl mFeatureFlags;
		private ArrayList<BluetoothDevice> mSdpTracker;
		private final Object mObject = new Object();

		@@ -155,7 +154,6 @@ public class RemoteDevices {
		RemoteDevices(AdapterService service, Looper looper) {
		mAdapter = ((Context) service).getSystemService(BluetoothManager.class).getAdapter();
		mAdapterService = service;
		mFeatureFlags = new FeatureFlagsImpl();
		mSdpTracker = new ArrayList<BluetoothDevice>();
		mDevices = new HashMap<String, DeviceProperties>();
		mDualDevicesMap = new HashMap<String, String>();
		@@ -1259,7 +1257,7 @@ public class RemoteDevices {
		Log.d(TAG, "keyMissingCallback device: " + bluetoothDevice);

		if (bluetoothDevice.getBondState() == BluetoothDevice.BOND_BONDED) {
		if (!mFeatureFlags.keyMissingBroadcast()) {
		if (!Flags.keyMissingBroadcast()) {
		Log.d(TAG, "flag not set - don't send key missing broadcast");
		return;
		}