Merge "Simplify checking for locally initiated bonds" am: b67b05afe9 am: 5da87a811c (84186b74) · Commits · e / os / android_packages_modules_Bluetooth

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

+2 −9

Original line number	Diff line number	Diff line
		@@ -1476,7 +1476,8 @@ public class AdapterService extends Service {

		enforceBluetoothPermission(service);

		return service.isBondingInitiatedLocally(device);
		DeviceProperties deviceProp = service.mRemoteDevices.getDeviceProperties(device);
		return deviceProp != null && deviceProp.isBondingInitiatedLocally();
		}

		@Override
		@@ -2116,14 +2117,6 @@ public class AdapterService extends Service {
		return deviceProp.getBondState();
		}

		boolean isBondingInitiatedLocally(BluetoothDevice device) {
		DeviceProperties deviceProp = mRemoteDevices.getDeviceProperties(device);
		if (deviceProp == null) {
		return false;
		}
		return deviceProp.isBondingInitiatedLocally();
		}

		long getSupportedProfiles() {
		return Config.getSupportedProfilesBitMask();
		}