Handle csip set member automatic pair in Setting am: 629611a43e am: eb412a0614 am: 6097f9b830 (2d002576) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -2575,6 +2575,7 @@
		android:exported="true">
		<intent-filter>
		<action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
		<action android:name="android.bluetooth.action.CSIS_SET_MEMBER_AVAILABLE"/>
		</intent-filter>
		</receiver>

src/com/android/settings/bluetooth/BluetoothPairingRequest.java

+45 −26

Original line number	Diff line number	Diff line
		@@ -16,12 +16,14 @@

		package com.android.settings.bluetooth;

		import android.bluetooth.BluetoothCsipSetCoordinator;
		import android.bluetooth.BluetoothDevice;
		import android.content.BroadcastReceiver;
		import android.content.Context;
		import android.content.Intent;
		import android.os.PowerManager;
		import android.os.UserHandle;
		import android.text.TextUtils;

		import com.android.settingslib.bluetooth.LocalBluetoothManager;

		@@ -36,12 +38,14 @@ public final class BluetoothPairingRequest extends BroadcastReceiver {
		@Override
		public void onReceive(Context context, Intent intent) {
		String action = intent.getAction();
		if (action == null \|\| !action.equals(BluetoothDevice.ACTION_PAIRING_REQUEST)) {
		if (action == null) {
		return;
		}

		PowerManager powerManager = context.getSystemService(PowerManager.class);
		BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
		final LocalBluetoothManager mBluetoothManager = Utils.getLocalBtManager(context);
		if (TextUtils.equals(action, BluetoothDevice.ACTION_PAIRING_REQUEST)) {
		PowerManager powerManager = context.getSystemService(PowerManager.class);
		int pairingVariant = intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT,
		BluetoothDevice.ERROR);
		String deviceAddress = device != null ? device.getAddress() : null;
		@@ -49,7 +53,6 @@ public final class BluetoothPairingRequest extends BroadcastReceiver {
		boolean shouldShowDialog = LocalBluetoothPreferences.shouldShowDialogInForeground(
		context, deviceAddress, deviceName);

		final LocalBluetoothManager mBluetoothManager = Utils.getLocalBtManager(context);
		// Skips consent pairing dialog if the device was recently associated with CDM
		if (pairingVariant == BluetoothDevice.PAIRING_VARIANT_CONSENT
		&& (device.canBondWithoutDialog()
		@@ -59,8 +62,8 @@ public final class BluetoothPairingRequest extends BroadcastReceiver {
		// Since the screen is on and the BT-related activity is in the foreground,
		// just open the dialog
		// convert broadcast intent into activity intent (same action string)
		Intent pairingIntent = BluetoothPairingService.getPairingDialogIntent(context, intent,
		BluetoothDevice.EXTRA_PAIRING_INITIATOR_FOREGROUND);
		Intent pairingIntent = BluetoothPairingService.getPairingDialogIntent(context,
		intent, BluetoothDevice.EXTRA_PAIRING_INITIATOR_FOREGROUND);

		context.startActivityAsUser(pairingIntent, UserHandle.CURRENT);
		} else {
		@@ -69,5 +72,21 @@ public final class BluetoothPairingRequest extends BroadcastReceiver {
		intent.setAction(BluetoothDevice.ACTION_PAIRING_REQUEST);
		context.startServiceAsUser(intent, UserHandle.CURRENT);
		}
		} else if (TextUtils.equals(action,
		BluetoothCsipSetCoordinator.ACTION_CSIS_SET_MEMBER_AVAILABLE)) {
		if (device == null) {
		return;
		}

		final int groupId = intent.getIntExtra(BluetoothCsipSetCoordinator.EXTRA_CSIS_GROUP_ID,
		BluetoothCsipSetCoordinator.GROUP_ID_INVALID);
		if (groupId == BluetoothCsipSetCoordinator.GROUP_ID_INVALID) {
		return;
		}

		if (mBluetoothManager.getCachedDeviceManager().shouldPairByCsip(device, groupId)) {
		device.createBond(BluetoothDevice.TRANSPORT_LE);
		}
		}
		}
		}