Merge "OPP: Use identity address" (eea40d1e) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/opp/BluetoothOppHandoverReceiver.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -78,13 +78,13 @@ public class BluetoothOppHandoverReceiver extends BroadcastReceiver {
		} else if (action.equals(Constants.ACTION_ACCEPTLIST_DEVICE)) {
		BluetoothDevice device =
		(BluetoothDevice) intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
		if (D) {
		Log.d(TAG, "Adding " + device + " to acceptlist");
		}
		if (device == null) {
		return;
		}
		BluetoothOppManager.getInstance(context).addToAcceptlist(device.getAddress());
		if (D) {
		Log.d(TAG, "Adding " + device.getIdentityAddress() + " to acceptlist");
		}
		BluetoothOppManager.getInstance(context).addToAcceptlist(device.getIdentityAddress());
		} else if (action.equals(Constants.ACTION_STOP_HANDOVER)) {
		int id = intent.getIntExtra(Constants.EXTRA_BT_OPP_TRANSFER_ID, -1);
		if (id != -1) {

android/app/src/com/android/bluetooth/opp/BluetoothOppManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -470,7 +470,7 @@ public class BluetoothOppManager {
		}

		values.put(BluetoothShare.MIMETYPE, contentType);
		values.put(BluetoothShare.DESTINATION, mRemoteDevice.getAddress());
		values.put(BluetoothShare.DESTINATION, mRemoteDevice.getIdentityAddress());
		values.put(BluetoothShare.TIMESTAMP, ts);
		if (mIsHandoverInitiated) {
		values.put(BluetoothShare.USER_CONFIRMATION,
		@@ -492,7 +492,7 @@ public class BluetoothOppManager {
		ContentValues values = new ContentValues();
		values.put(BluetoothShare.URI, mUri);
		values.put(BluetoothShare.MIMETYPE, mTypeOfSingleFile);
		values.put(BluetoothShare.DESTINATION, mRemoteDevice.getAddress());
		values.put(BluetoothShare.DESTINATION, mRemoteDevice.getIdentityAddress());
		if (mIsHandoverInitiated) {
		values.put(BluetoothShare.USER_CONFIRMATION,
		BluetoothShare.USER_CONFIRMATION_HANDOVER_CONFIRMED);

android/app/src/com/android/bluetooth/opp/BluetoothOppPreference.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -98,15 +98,15 @@ public class BluetoothOppPreference {
		}

		private String getChannelKey(BluetoothDevice remoteDevice, int uuid) {
		return remoteDevice.getAddress() + "_" + Integer.toHexString(uuid);
		return remoteDevice.getIdentityAddress() + "_" + Integer.toHexString(uuid);
		}

		public String getName(BluetoothDevice remoteDevice) {
		if (remoteDevice.getAddress().equals("FF:FF:FF:00:00:00")) {
		if (remoteDevice.getIdentityAddress().equals("FF:FF:FF:00:00:00")) {
		return "localhost";
		}
		if (!mNames.isEmpty()) {
		String name = mNames.get(remoteDevice.getAddress());
		String name = mNames.get(remoteDevice.getIdentityAddress());
		if (name != null) {
		return name;
		}
		@@ -124,7 +124,7 @@ public class BluetoothOppPreference {
		channel = mChannels.get(key);
		if (V) {
		Log.v(TAG,
		"getChannel for " + remoteDevice + "_" + Integer.toHexString(uuid) + " as "
		"getChannel for " + remoteDevice.getIdentityAddress() + "_" + Integer.toHexString(uuid) + " as "
		+ channel);
		}
		}
		@@ -133,19 +133,19 @@ public class BluetoothOppPreference {

		public void setName(BluetoothDevice remoteDevice, String name) {
		if (V) {
		Log.v(TAG, "Setname for " + remoteDevice + " to " + name);
		Log.v(TAG, "Setname for " + remoteDevice.getIdentityAddress() + " to " + name);
		}
		if (name != null && !name.equals(getName(remoteDevice))) {
		Editor ed = mNamePreference.edit();
		ed.putString(remoteDevice.getAddress(), name);
		ed.putString(remoteDevice.getIdentityAddress(), name);
		ed.apply();
		mNames.put(remoteDevice.getAddress(), name);
		mNames.put(remoteDevice.getIdentityAddress(), name);
		}
		}

		public void setChannel(BluetoothDevice remoteDevice, int uuid, int channel) {
		if (V) {
		Log.v(TAG, "Setchannel for " + remoteDevice + "_" + Integer.toHexString(uuid) + " to "
		Log.v(TAG, "Setchannel for " + remoteDevice.getIdentityAddress() + "_" + Integer.toHexString(uuid) + " to "
		+ channel);
		}
		if (channel != getChannel(remoteDevice, uuid)) {

android/app/src/com/android/bluetooth/opp/BluetoothOppReceiver.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -66,14 +66,15 @@ public class BluetoothOppReceiver extends BroadcastReceiver {

		BluetoothDevice remoteDevice = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);

		if (D) {
		Log.d(TAG, "Received BT device selected intent, bt device: " + remoteDevice);
		}

		if (remoteDevice == null) {
		mOppManager.cleanUpSendingFileInfo();
		return;
		}

		if (D) {
		Log.d(TAG, "Received BT device selected intent, bt device: " + remoteDevice.getIdentityAddress());
		}

		// Insert transfer session record to database
		mOppManager.startTransfer(remoteDevice);

android/app/src/com/android/bluetooth/opp/BluetoothOppService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1231,7 +1231,7 @@ public class BluetoothOppService extends ProfileService implements IObexConnecti
		public boolean onConnect(BluetoothDevice device, BluetoothSocket socket) {

		if (D) {
		Log.d(TAG, " onConnect BluetoothSocket :" + socket + " \n :device :" + device);
		Log.d(TAG, " onConnect BluetoothSocket :" + socket + " \n :device :" + device.getIdentityAddress());
		}
		if (!mAcceptNewConnections) {
		Log.d(TAG, " onConnect BluetoothSocket :" + socket + " rejected");