Merge changes I0f351991,Iec79211e am: 5815a5006e am: 209689c8cb (f060e1c8) · Commits · e / os / android_packages_apps_Bluetooth

src/com/android/bluetooth/Utils.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -71,6 +71,10 @@ public final class Utils {
		return getBytesFromAddress(device.getAddress());
		}

		public static byte[] addressToBytes(String address) {
		return getBytesFromAddress(address);
		}

		public static byte[] getBytesFromAddress(String address) {
		int i, j = 0;
		byte[] output = new byte[BD_ADDR_LEN];

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

+9 −22

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import static com.android.bluetooth.Utils.enforceLocalMacAddressPermission;
		import static com.android.bluetooth.Utils.enforceDumpPermission;
		import static com.android.bluetooth.Utils.callerIsSystemOrActiveUser;
		import static com.android.bluetooth.Utils.callerIsSystemOrActiveOrManagedUser;
		import static com.android.bluetooth.Utils.addressToBytes;

		import android.app.ActivityManager;
		import android.app.AlarmManager;
		@@ -1374,7 +1375,7 @@ public class AdapterService extends Service {

		enforceBluetoothPermission(service);

		return service.getAdapterConnectionState();
		return service.mAdapterProperties.getConnectionState();
		}

		@Override
		@@ -1386,7 +1387,7 @@ public class AdapterService extends Service {

		enforceBluetoothPermission(service);

		return service.getProfileConnectionState(profile);
		return service.mAdapterProperties.getProfileConnectionState(profile);
		}

		@Override
		@@ -1422,7 +1423,12 @@ public class AdapterService extends Service {

		enforceBluetoothAdminPermission(service);

		return service.cancelBondProcess(device);
		DeviceProperties deviceProp = service.mRemoteDevices.getDeviceProperties(device);
		if (deviceProp != null) {
		deviceProp.setBondingInitiatedLocally(false);
		}

		return service.cancelBondNative(addressToBytes(device.getAddress()));
		}

		@Override
		@@ -2004,14 +2010,6 @@ public class AdapterService extends Service {
		return mDatabaseManager;
		}

		int getAdapterConnectionState() {
		return mAdapterProperties.getConnectionState();
		}

		int getProfileConnectionState(int profile) {
		return mAdapterProperties.getProfileConnectionState(profile);
		}

		boolean sdpSearch(BluetoothDevice device, ParcelUuid uuid) {
		enforceBluetoothPermission(this);
		if (mSdpManager != null) {
		@@ -2076,17 +2074,6 @@ public class AdapterService extends Service {
		mBondStateMachine.sendMessage(msg);
		}

		boolean cancelBondProcess(BluetoothDevice device) {
		byte[] addr = Utils.getBytesFromAddress(device.getAddress());

		DeviceProperties deviceProp = mRemoteDevices.getDeviceProperties(device);
		if (deviceProp != null) {
		deviceProp.setBondingInitiatedLocally(false);
		}

		return cancelBondNative(addr);
		}

		boolean removeBond(BluetoothDevice device) {
		DeviceProperties deviceProp = mRemoteDevices.getDeviceProperties(device);
		if (deviceProp == null \|\| deviceProp.getBondState() != BluetoothDevice.BOND_BONDED) {