Merge "OPP: Update batch status when sdp failed" am: 0110293bfa am: 92940f4f16 (f0f4fd8b) · Commits · e / os / android_packages_modules_Bluetooth

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

+14 −15

Original line number	Original line	Diff line number	Diff line
	@@ -160,6 +160,7 @@ public class BluetoothOppTransfer implements BluetoothOppBatch.BluetoothOppBatch
	intent.getParcelableExtra(BluetoothDevice.EXTRA_SDP_RECORD);		intent.getParcelableExtra(BluetoothDevice.EXTRA_SDP_RECORD);
	if (record == null) {		if (record == null) {
	Log.w(TAG, " Invalid SDP , ignoring !!");		Log.w(TAG, " Invalid SDP , ignoring !!");
			markConnectionFailed(null);
	return;		return;
	}		}
	mConnectThread =		mConnectThread =
	@@ -827,6 +828,7 @@ public class BluetoothOppTransfer implements BluetoothOppBatch.BluetoothOppBatch
	return;		return;
	}		}
	}		}
			};

	private void markConnectionFailed(BluetoothSocket s) {		private void markConnectionFailed(BluetoothSocket s) {
	if (V) {		if (V) {
	@@ -844,9 +846,6 @@ public class BluetoothOppTransfer implements BluetoothOppBatch.BluetoothOppBatch
	mSessionHandler.obtainMessage(TRANSPORT_ERROR).sendToTarget();		mSessionHandler.obtainMessage(TRANSPORT_ERROR).sendToTarget();
	return;		return;
	}		}
	}

	;

	/* update a trivial field of a share to notify Provider the batch status change */		/* update a trivial field of a share to notify Provider the batch status change */
	private void tickShareStatus(BluetoothOppShareInfo share) {		private void tickShareStatus(BluetoothOppShareInfo share) {